From nobody Sat Nov 07 22:15:04 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 4jMVj52J9zz6xtl5 for ; Sat, 07 Nov 2026 22:15:05 +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 4jMVj45ZNjz4MZW for ; Sat, 07 Nov 2026 22:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089704; 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=5TDcrFMYfzAmXi3X15Gl+1EbpJ8N/Lvm84mbywSMcjI=; b=pa+U/KuUuJIgf3JJgyR+c/JGPBcBwPzQ5oZqDpYpnK6J+khaUkQ0zunzu+ZjpquO6fP0Br WZ7eO6AaMoL8bITpVcLM3BcJIc06t3dep+v6m7cDMnXI6tS7o3H34FSS5rK8nAsfK+ySD9 4NyNwdaPueP2CQoq4JZxsHKAaFVIwttzEpQO1OmZbspwhJZDTjMDIYlG9GB6KD2CUEF0DZ sHk08T1N4XWTk8JJGE4zhphoQyQ3XYT0gfc/6GDJP21WjBRXGBBxBloA7FRc7llHTgAkNf 1uthXiMKZhXWytF//F3pG8QorqE1DotxkX/FkTiopuzbeJyPuyGwTqvtAp89IA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794089704; b=n/uVvzwRElyRt9mcTyusjlAQHEgQZncgJGHUMHGfDrq6ctyx+JRbVpzniEdxQbC8EdGQfi 6m7+VUD3yqjjtgLaX4G2qFAprpMSMedkvbtlY1objMGwvuLAO38xHy5zY6ID+1vhQwZK2l 57zNXJhyrVW9Nmv0+qc/KBDFpjuDMwa4XZGjDIKqPc9Es/hsPCMpQHkavpXc1xq5+IpeB2 jJCzZbzJ+UGuOpbPBVcp/nkkK/9iDXyS9LERF1iwjhPieiarVCxOkn+A1vynpU1HDMOY03 HC6SG6Lbyy9f6hmAsU2E7oepnHIfBSFAkrgiyZS7XTefyS752Xt+iTga5fv8rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794089704; 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=5TDcrFMYfzAmXi3X15Gl+1EbpJ8N/Lvm84mbywSMcjI=; b=wvH68kquxSYCGOgWBwoeQ7od5rH19V5ymcmQ7PKVG9Uuj3Tm1F/lJcdubod/YJ0AIwjrPw OjhcKyuJwNE7vATO65a/NDBFNy38qqiynJ24KNcuOMrK8bj8IfLeLUkw406cAbbT11E02a iWoJaI83lvoRfJddeaLbcpgK17QM3D11Pz0TVQJu9Z3W1FWOEoJbCc+XktL1m5Dcws/odm PnTSyYl6MCetP+qrLBKfGzYePWNUAxze4SfeuoOst16yiSGUoem8opFJkU8aZ48jZ3C06F iJyqPIbOIHrW+/RMYxmswFqJfYWt/ErIQjRMJv1aGJtCVYtSHZ+pGMdBPPOGJg== 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 4jMVj44n51zh6C for ; Sat, 07 Nov 2026 22:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e6d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 22:15:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: c72040208bab - main - asmc: collapse the SMS axis and light sensor sysctl handlers 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: c72040208bab453dd73efeafd41063512ddabe2e Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 22:15:04 +0000 Message-Id: <6aefa2e8.3e6d9.3c00b150@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=c72040208bab453dd73efeafd41063512ddabe2e commit c72040208bab453dd73efeafd41063512ddabe2e Author: Abdelkader Boudih AuthorDate: 2026-11-07 20:26:42 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-07 20:26:42 +0000 asmc: collapse the SMS axis and light sensor sysctl handlers asmc_mb_sysctl_sms_{x,y,z} differed only in which SMS key they read, and asmc_mbp_sysctl_light_{left,right} only in which light key. One handler each, selecting from a table through arg2. No functional change. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D61287 --- sys/dev/asmc/asmc.c | 116 +++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 78 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 6084fac53fc7..c0ec673e707d 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -127,11 +127,8 @@ static int asmc_mb_sysctl_fanid(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fanspeed(SYSCTL_HANDLER_ARGS); static int asmc_mb_sysctl_fanmanual(SYSCTL_HANDLER_ARGS); static int asmc_temp_sysctl(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS); -static int asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS); -static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS); -static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS); +static int asmc_mb_sysctl_sms(SYSCTL_HANDLER_ARGS); +static int asmc_mbp_sysctl_light(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS); static int asmc_aupo_sysctl(SYSCTL_HANDLER_ARGS); @@ -519,6 +516,26 @@ static const struct { CTLTYPE_INT | CTLFLAG_RW, asmc_mb_sysctl_fanmanual, 0, false }, }; +/* The dev.asmc.n.sms axes, selected by arg2. */ +static const struct { + const char *name; + const char *key; + const char *desc; +} asmc_sms_sysctls[] = { + { "x", ASMC_KEY_SMS_X, "Sudden Motion Sensor X value" }, + { "y", ASMC_KEY_SMS_Y, "Sudden Motion Sensor Y value" }, + { "z", ASMC_KEY_SMS_Z, "Sudden Motion Sensor Z value" }, +}; + +/* The ambient light sensors, selected by arg2. */ +#define ASMC_LIGHT_LEFT 0 +#define ASMC_LIGHT_RIGHT 1 + +static const char * const asmc_light_keys[] = { + [ASMC_LIGHT_LEFT] = ASMC_KEY_LIGHTLEFT, + [ASMC_LIGHT_RIGHT] = ASMC_KEY_LIGHTRIGHT, +}; + static int asmc_attach(device_t dev) { @@ -613,10 +630,10 @@ asmc_attach(device_t dev) SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "left", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, 0, + dev, ASMC_LIGHT_LEFT, sc->sc_light_len == ASMC_LIGHT_LONGLEN ? asmc_mbp_sysctl_light_left_10byte : - asmc_mbp_sysctl_light_left, + asmc_mbp_sysctl_light, "I", "Keyboard backlight left sensor"); if (sc->sc_light_len != ASMC_LIGHT_LONGLEN && @@ -626,8 +643,8 @@ asmc_attach(device_t dev) SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "right", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, 0, - asmc_mbp_sysctl_light_right, "I", + dev, ASMC_LIGHT_RIGHT, + asmc_mbp_sysctl_light, "I", "Keyboard backlight right sensor"); } @@ -780,26 +797,14 @@ asmc_attach(device_t dev) SYSCTL_CHILDREN(sysctlnode), OID_AUTO, "sms", CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Sudden Motion Sensor"); - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_sms_tree), - OID_AUTO, "x", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, 0, asmc_mb_sysctl_sms_x, "I", - "Sudden Motion Sensor X value"); - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_sms_tree), - OID_AUTO, "y", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, 0, asmc_mb_sysctl_sms_y, "I", - "Sudden Motion Sensor Y value"); - - SYSCTL_ADD_PROC(sysctlctx, - SYSCTL_CHILDREN(sc->sc_sms_tree), - OID_AUTO, "z", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, - dev, 0, asmc_mb_sysctl_sms_z, "I", - "Sudden Motion Sensor Z value"); + for (unsigned int k = 0; k < nitems(asmc_sms_sysctls); k++) { + SYSCTL_ADD_PROC(sysctlctx, + SYSCTL_CHILDREN(sc->sc_sms_tree), + OID_AUTO, asmc_sms_sysctls[k].name, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, + dev, k, asmc_mb_sysctl_sms, "I", + asmc_sms_sysctls[k].desc); + } /* * Need a taskqueue to send devctl_notify() events @@ -2314,14 +2319,14 @@ asmc_sms_task(void *arg, int pending) } static int -asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) +asmc_mb_sysctl_sms(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; int error; int16_t val; int32_t v; - asmc_sms_read(dev, ASMC_KEY_SMS_X, &val); + asmc_sms_read(dev, asmc_sms_sysctls[arg2].key, &val); v = (int32_t)val; error = sysctl_handle_int(oidp, &v, 0, req); @@ -2329,59 +2334,14 @@ asmc_mb_sysctl_sms_x(SYSCTL_HANDLER_ARGS) } static int -asmc_mb_sysctl_sms_y(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - int error; - int16_t val; - int32_t v; - - asmc_sms_read(dev, ASMC_KEY_SMS_Y, &val); - v = (int32_t)val; - error = sysctl_handle_int(oidp, &v, 0, req); - - return (error); -} - -static int -asmc_mb_sysctl_sms_z(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - int error; - int16_t val; - int32_t v; - - asmc_sms_read(dev, ASMC_KEY_SMS_Z, &val); - v = (int32_t)val; - error = sysctl_handle_int(oidp, &v, 0, req); - - return (error); -} - -static int -asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - uint8_t buf[6]; - int error; - int32_t v; - - asmc_key_read(dev, ASMC_KEY_LIGHTLEFT, buf, sizeof(buf)); - v = buf[2]; - error = sysctl_handle_int(oidp, &v, 0, req); - - return (error); -} - -static int -asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS) +asmc_mbp_sysctl_light(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; uint8_t buf[6]; int error; int32_t v; - asmc_key_read(dev, ASMC_KEY_LIGHTRIGHT, buf, sizeof(buf)); + asmc_key_read(dev, asmc_light_keys[arg2], buf, sizeof(buf)); v = buf[2]; error = sysctl_handle_int(oidp, &v, 0, req);