git: e029e26ca087 - main - asmc: register the fan id sysctl with a string format
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Nov 2026 21:21:52 UTC
The branch main has been updated by seuros:
URL: https://cgit.FreeBSD.org/src/commit/?id=e029e26ca08744a4d50c29b3f7226bf0379be603
commit e029e26ca08744a4d50c29b3f7226bf0379be603
Author: Abdelkader Boudih <seuros@FreeBSD.org>
AuthorDate: 2026-11-15 21:12:47 +0000
Commit: Abdelkader Boudih <seuros@FreeBSD.org>
CommitDate: 2026-11-15 21:12:47 +0000
asmc: register the fan id sysctl with a string format
Every fan sysctl was registered with a hardcoded "I" format, but id
is CTLTYPE_STRING. Carry the format in the table instead.
MFC after: 3 days
Reviewed by: ngie
Differential Revision: https://reviews.freebsd.org/D61484
---
sys/dev/asmc/asmc_sysctl.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/sys/dev/asmc/asmc_sysctl.c b/sys/dev/asmc/asmc_sysctl.c
index d832e717c83e..058280bd3fc7 100644
--- a/sys/dev/asmc/asmc_sysctl.c
+++ b/sys/dev/asmc/asmc_sysctl.c
@@ -366,24 +366,27 @@ static const struct {
const char *name;
const char *desc;
int ctlflags;
+ const char *fmt;
int (*handler)(SYSCTL_HANDLER_ARGS);
int which;
bool needs_safespeed;
} asmc_fan_sysctls[] = {
- { "id", "Fan ID", CTLTYPE_STRING | CTLFLAG_RD,
+ { "id", "Fan ID", CTLTYPE_STRING | CTLFLAG_RD, "A",
asmc_mb_sysctl_fanid, 0, false },
- { "speed", "Fan speed in RPM", CTLTYPE_INT | CTLFLAG_RD,
+ { "speed", "Fan speed in RPM", CTLTYPE_INT | CTLFLAG_RD, "I",
asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_CUR, false },
- { "safespeed", "Fan safe speed in RPM", CTLTYPE_INT | CTLFLAG_RD,
+ { "safespeed", "Fan safe speed in RPM", CTLTYPE_INT | CTLFLAG_RD, "I",
asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_SAFE, true },
- { "minspeed", "Fan minimum speed in RPM", CTLTYPE_INT | CTLFLAG_RW,
+ { "minspeed", "Fan minimum speed in RPM", CTLTYPE_INT | CTLFLAG_RW, "I",
asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_MIN, false },
- { "maxspeed", "Fan maximum speed in RPM", CTLTYPE_INT | CTLFLAG_RW,
+ { "maxspeed", "Fan maximum speed in RPM", CTLTYPE_INT | CTLFLAG_RW, "I",
asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_MAX, false },
- { "targetspeed", "Fan target speed in RPM", CTLTYPE_INT | CTLFLAG_RW,
+ { "targetspeed", "Fan target speed in RPM",
+ CTLTYPE_INT | CTLFLAG_RW, "I",
asmc_mb_sysctl_fanspeed, ASMC_FANSPEED_TARGET, false },
{ "manual", "Fan manual mode (0=auto, 1=manual)",
- CTLTYPE_INT | CTLFLAG_RW, asmc_mb_sysctl_fanmanual, 0, false },
+ CTLTYPE_INT | CTLFLAG_RW, "I",
+ asmc_mb_sysctl_fanmanual, 0, false },
};
void
@@ -416,7 +419,8 @@ asmc_sysctl_add_fan(device_t dev, struct sysctl_ctx_list *ctx)
OID_AUTO, asmc_fan_sysctls[k].name,
asmc_fan_sysctls[k].ctlflags | CTLFLAG_MPSAFE,
dev, ASMC_FAN_ARG2(asmc_fan_sysctls[k].which, j),
- asmc_fan_sysctls[k].handler, "I",
+ asmc_fan_sysctls[k].handler,
+ asmc_fan_sysctls[k].fmt,
asmc_fan_sysctls[k].desc, NULL);
}
}