From nobody Sat Nov 07 22:15:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jMVj7375Wz6xtfc for ; Sat, 07 Nov 2026 22:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMVj66DNcz4MdL for ; Sat, 07 Nov 2026 22:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hqr05z/NGK6A3CWdqa/cgALuhvlmaJrkcJLQ399kz2M=; b=CdrwX9HNidmNTWE3T9ECtxWDOoDpSYNm1B3KsisS1Ru2lotzF2ec30j3UhnUIHuHCQkY3r 2ivDxzkIpReXU+NWyF79bSSvtsQ+LsymhEKA9GiXqISke/eWx8JMrsbRmM60YnKrfZ2qWE +wsByyIHWnuQMPGhzEYRTvlZ532QCF59p4NMSBF6XYAlBbdCKMMu1sPYC+AmCcMOCFy3Rx JMxOfMPJjaLCr5F03483uBRU7bRfw9GbbNoOMPh8hwJf/kEo5RCI8x/cSdCTj9qI/2o9Ps jaFCeIKSOq6c4vsOC0LsqwpcIzyNjoApQobHKP2dcDiEZHWQznV5EEU6sYaiaw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794089706; b=ayq6eBqsT7kZiuc/v9EuOZQEamHCv1skYa4nW8N3niEHTFnzygjhpYvJOFHPYJYOUQjRyw ax+9yTXEBMv8tafqKGnhMqT9PO74sjcUke7YOBc8Fw4UY1N/WuEWEJ4tezRJinT3Lb8CYv UehiWBNiAsPm2QatvTjte5xRF1wcMO1Eabmssdutb5w7MDqZ0vglstOTekl5MkFhyWlhtO EyGN4mEQJTQi0ZY4ZygTNiBD6dQQGGloxeDAY0oEPKBCUeIo5yI9wb03DG4i+TWYIQ2P9o 9usgI8ajkC3kbvbRSAvbhUpc9W31Yya0QE/R3jEy1ceygjvBG9NOiTaZIweZNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hqr05z/NGK6A3CWdqa/cgALuhvlmaJrkcJLQ399kz2M=; b=lM/e0cbPiGZjAZ1HxIs9xjZaTxnV16a3iDUaNsXW9sl56xbiX9kNMztwN50TE/R8e4GIvG GICoIQWMJKFlM6HsJxIKAguJGdAjsgA8yZ2ocbCHqd6l3VqSqDB8fIkiVp8NznPuiy9Zp9 6dRLMmQrJ6ESuoQW3v4dCbgKfvF2NaEq0MbYBLGzSYgp2UPpsgXtkD8q1lSziT+Xv9x+BY WbEoata5DImJFvqygvUWmQl/HWfb0jsy+tEwgbg8oSjZv/nU4KiU6p3dZkjyFRg4pohB3Q gKuVPux5AXYWKkAgITqzrl3FGRWk9hSc2vjwx3rN36ICnhEcuumL1Hq3GZ3hdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jMVj65l6Szh6D for ; Sat, 07 Nov 2026 22:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f814 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 22:15:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: f0f940c8df9d - main - asmc: scan every sensor range through one helper List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0f940c8df9d643ad616349c71c10714c54b3c3d Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 22:15:06 +0000 Message-Id: <6aefa2ea.3f814.83d6863@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=f0f940c8df9d643ad616349c71c10714c54b3c3d commit f0f940c8df9d643ad616349c71c10714c54b3c3d Author: Abdelkader Boudih AuthorDate: 2026-11-07 20:27:01 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-07 20:27:01 +0000 asmc: scan every sensor range through one helper asmc_detect_sensors hand-rolled the temperature and light scans as copies of asmc_scan_sensor_range(). Give the helper a match predicate and route all five ranges through it. No functional change. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D61289 --- sys/dev/asmc/asmc.c | 135 ++++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 74 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 279e7829c19c..75ccb933f4d9 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -527,6 +527,20 @@ static const struct { { "z", ASMC_KEY_SMS_Z, "Sudden Motion Sensor Z value" }, }; +/* Every key asmc_sms_init() touches; all must be present for SMS. */ +static const char * const asmc_sms_required_keys[] = { + ASMC_KEY_SMS, + ASMC_KEY_SMS_X, + ASMC_KEY_SMS_Y, + ASMC_KEY_SMS_Z, + ASMC_KEY_SMS_LOW, + ASMC_KEY_SMS_HIGH, + ASMC_KEY_SMS_LOW_INT, + ASMC_KEY_SMS_HIGH_INT, + ASMC_KEY_SMS_FLAG, + ASMC_KEY_INTOK, +}; + /* The ambient light sensors, selected by arg2. */ #define ASMC_LIGHT_LEFT 0 #define ASMC_LIGHT_RIGHT 1 @@ -1123,27 +1137,14 @@ asmc_detect_capabilities(device_t dev) char type[ASMC_TYPELEN + 1]; /* SMS: require all keys used by asmc_sms_init() */ - sc->sc_has_sms = - (asmc_key_getinfo(dev, ASMC_KEY_SMS, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_X, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_Y, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_Z, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_LOW, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_HIGH, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_LOW_INT, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_HIGH_INT, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_SMS_FLAG, - &len, type) == 0 && - asmc_key_getinfo(dev, ASMC_KEY_INTOK, - &len, type) == 0); + sc->sc_has_sms = 1; + for (unsigned int k = 0; k < nitems(asmc_sms_required_keys); k++) { + if (asmc_key_getinfo(dev, asmc_sms_required_keys[k], + &len, type) != 0) { + sc->sc_has_sms = 0; + break; + } + } /* Light sensor: require ALV0 (len 6 or 10) and LKSB */ if (asmc_key_getinfo(dev, ASMC_KEY_LIGHTLEFT, @@ -1667,27 +1668,46 @@ asmc_sensor_sysctl(SYSCTL_HANDLER_ARGS) return (sysctl_handle_int(oidp, &val, 0, req)); } -/* - * Scan a range of SMC key indices, adding matching sensors. - * Only considers 2-byte keys with a supported type. - */ +static bool +asmc_match_sp78(const char *key __unused, const char *type) +{ + + return (strncmp(type, "sp78", 4) == 0); +} + +static bool +asmc_match_supported(const char *key __unused, const char *type) +{ + + return (asmc_sensor_type_supported(type)); +} + +static bool +asmc_match_light(const char *key, const char *type) +{ + + return (key[1] == 'L' && (key[2] == 'V' || key[2] == 'S') && + asmc_sensor_type_supported(type)); +} + +/* Scan key indices for 2-byte keys passing prefix (if set) and match. */ static void asmc_scan_sensor_range(device_t dev, unsigned int start, - unsigned int end, char prefix, int *countp, char **sensors, - int maxcount) + unsigned int end, char prefix, + bool (*match)(const char *key, const char *type), int *countp, + char **sensors, int maxcount) { char key[ASMC_KEYLEN + 1]; char type[ASMC_TYPELEN + 1]; uint8_t len; - unsigned int i; char *sensor_key; - for (i = start; i < end; i++) { + for (unsigned int i = start; i < end; i++) { if (asmc_key_dump_by_index(dev, i, key, type, &len)) continue; - if (key[0] != prefix || len != 2) + if (len != 2 || (prefix != '\0' && key[0] != prefix)) continue; - if (!asmc_sensor_type_supported(type)) + if (!match(key, type)) continue; if (*countp >= maxcount) break; @@ -1704,12 +1724,8 @@ asmc_detect_sensors(device_t dev) struct asmc_softc *sc = device_get_softc(dev); struct sysctl_ctx_list *sysctlctx; struct sysctl_oid *tree_node; - char key[ASMC_KEYLEN + 1]; - char type[ASMC_TYPELEN + 1]; - uint8_t len; unsigned int start, end, i; int error; - char *sensor_key; sc->sc_voltage_count = 0; sc->sc_current_count = 0; @@ -1727,23 +1743,9 @@ asmc_detect_sensors(device_t dev) error = asmc_key_search(dev, "T\0\0\0", &start); if (error == 0) error = asmc_key_search(dev, "U\0\0\0", &end); - if (error == 0) { - for (i = start; i < end; i++) { - if (asmc_key_dump_by_index(dev, i, - key, type, &len)) - continue; - if (len != 2 || - strncmp(type, "sp78", 4) != 0) - continue; - if (sc->sc_temp_count >= ASMC_TEMP_MAX) - break; - sensor_key = malloc(ASMC_KEYLEN + 1, - M_DEVBUF, M_WAITOK); - memcpy(sensor_key, key, ASMC_KEYLEN + 1); - sc->sc_temp_sensors[sc->sc_temp_count++] = - sensor_key; - } - } + if (error == 0) + asmc_scan_sensor_range(dev, start, end, '\0', asmc_match_sp78, + &sc->sc_temp_count, sc->sc_temp_sensors, ASMC_TEMP_MAX); /* Voltage/Current/Power sensors */ static const struct { @@ -1772,34 +1774,19 @@ asmc_detect_sensors(device_t dev) sensor_ranges[r].range_end, &end); if (error == 0) asmc_scan_sensor_range(dev, start, end, - sensor_ranges[r].prefix, sensor_counts[r], - sensor_arrays[r], ASMC_MAX_SENSORS); + sensor_ranges[r].prefix, asmc_match_supported, + sensor_counts[r], sensor_arrays[r], + ASMC_MAX_SENSORS); } /* Ambient light sensors: AL* in A..B range */ error = asmc_key_search(dev, "A\0\0\0", &start); if (error == 0) error = asmc_key_search(dev, "B\0\0\0", &end); - if (error == 0) { - for (i = start; i < end; i++) { - if (asmc_key_dump_by_index(dev, i, - key, type, &len)) - continue; - if (key[0] != 'A' || key[1] != 'L' || - (key[2] != 'V' && key[2] != 'S') || - len != 2) - continue; - if (!asmc_sensor_type_supported(type)) - continue; - if (sc->sc_light_count >= ASMC_MAX_SENSORS) - break; - sensor_key = malloc(ASMC_KEYLEN + 1, - M_DEVBUF, M_WAITOK); - memcpy(sensor_key, key, ASMC_KEYLEN + 1); - sc->sc_light_sensors[sc->sc_light_count++] = - sensor_key; - } - } + if (error == 0) + asmc_scan_sensor_range(dev, start, end, 'A', asmc_match_light, + &sc->sc_light_count, sc->sc_light_sensors, + ASMC_MAX_SENSORS); if (bootverbose) device_printf(dev,