From nobody Wed Nov 04 23:30:18 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 4jKhWM5vrgz70Kbn for ; Wed, 04 Nov 2026 23:30:23 +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 4jKhWM4KcFz3KCT for ; Wed, 04 Nov 2026 23:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793835023; 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=QUqhsvz1qzqfQYhlAC1VMsEN/v1DU3cqDKEi3rzAnxo=; b=ZVO0gqAFUEtDDQBUgQ8vRty04DwGppUSR2xiCWkU5rwnKZuWBDIwAWGhlOPao/eUSnG5kl PxDSxBGFWfBAqGeUz3ZtEBUlzsJ/VJIT6X+vulLL+hmsQmt96FvecO8kVUEBvk8Fmykw/J 1hfE3wzBg0yZ/hTMOqgtH8iXsrW7kXbymGrrbQ6dLI95j6k+Oetghl+WUyCnVl4OTVIs37 Xen1W86rjGAtMLwsajdazKEpNpf33ShNJHex6PAjTPvijWv3mvqzYl5XsVHUMD6/NLal9v rWAso2e02ygPvL/m/SoUkpZjAOKMXWWMfWmXocrGlChJlg5ekhXYfL2gFiVQvQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793835023; b=Bv3CRpAc+zpwUNkoBxeTk5jD2VIMj9MmJN11D2gbmBvzW2/HbZ1da4tw6d4SwJsuSshho4 pctyWMZaHPqo+Xi2SwP45jzc9WCAYNe1wMxDiL/u9erXpWAoSjwpifP0MK0fm/SJ8iTwwR PNCBZ3/tvfzJZgaHBijP0c6ZMiNIGX/bT8nl/Kk3gpWZxG3Ilb6Ekf9CzqMCShvmCINaEB 4qMWulFxP3vDufX1UkAE2yQjmZqHu1TJDtrXmu917sI/Z2YWCBCaU2xz435oFuZwTS1XLq eYQ+OuVJuY9DBcAi9BeIWIdXz+X+2frYYjikWZAdLQD7DFL4yx6DJgBXsky7Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793835023; 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=QUqhsvz1qzqfQYhlAC1VMsEN/v1DU3cqDKEi3rzAnxo=; b=EjnVZkZIN7foucOL2VLaBDoEtwrp/91MpPR9LHgk7RPUAupgprLytnZbndCYh6QtAHdrC9 iLyrKAlGdnz5jYVNv24R8GRGhSLeMi38XQ9BQUzTVH8eXNP37ZZDA07jjv2Ao0Ls3yR7zw KE9zlnkmA1sc+rnf5vJsBLJHywKQStOArZEe7k8J7IOrdyXX26Tk0P7zsuWkG9E2vQRSzn hFydqKTWdgGEg+rltSvtocUtbJ/ooOZSTMmFJWmLvmPg/OkXwcfR3uLfLpYWWHM4n1/pzH JTpmcZY7FxOVeY4JROS0ivKZBhEMGx85zEopGLQCYxb3+0WYUw7NAYwuk/mjtg== 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 4jKhWM40m2zPFD for ; Wed, 04 Nov 2026 23:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36455 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 23:30:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 12b3c29a985d - main - ioctl: Add a macro for extracting the ioctl number from a command 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12b3c29a985d1753693d732372dafe915a890259 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 23:30:18 +0000 Message-Id: <6aebc00a.36455.1ffccaa3@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=12b3c29a985d1753693d732372dafe915a890259 commit 12b3c29a985d1753693d732372dafe915a890259 Author: Mark Johnston AuthorDate: 2026-11-04 22:38:17 +0000 Commit: Mark Johnston CommitDate: 2026-11-04 23:14:13 +0000 ioctl: Add a macro for extracting the ioctl number from a command Sprinkle it in various drivers which hard-coded the command layout. No functional change intended. Reviewed by: dumbbell, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61045 --- sys/compat/linuxkpi/common/include/linux/ioctl.h | 2 +- sys/dev/sound/pcm/dsp.c | 2 +- sys/dev/sound/pcm/mixer.c | 2 +- sys/dev/syscons/scvesactl.c | 11 ++++++----- sys/dev/syscons/scvidctl.c | 4 ++-- sys/netgraph/ng_eiface.c | 2 +- sys/sys/ioccom.h | 1 + 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ioctl.h b/sys/compat/linuxkpi/common/include/linux/ioctl.h index 77c01224e6a5..34a4138417ea 100644 --- a/sys/compat/linuxkpi/common/include/linux/ioctl.h +++ b/sys/compat/linuxkpi/common/include/linux/ioctl.h @@ -33,6 +33,6 @@ #define _IOC_SIZE(cmd) IOCPARM_LEN(cmd) #define _IOC_TYPE(cmd) IOCGROUP(cmd) -#define _IOC_NR(cmd) ((cmd) & 0xff) +#define _IOC_NR(cmd) IOCNUM(cmd) #endif /* _LINUXKPI_LINUX_IOCTL_H_ */ diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 9277a1f337ff..6fa00dbd3aa7 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -565,7 +565,7 @@ dsp_ioctl_channel(struct dsp_cdevpriv *priv, struct pcm_channel *ch, PCM_UNLOCKASSERT(d); - j = cmd & 0xff; + j = IOCNUM(cmd); rdch = priv->rdch; wrch = priv->wrch; diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index d55a48d6a735..c270d751dff5 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -912,7 +912,7 @@ mixer_ioctl_cmd(struct cdev *i_dev, unsigned long cmd, caddr_t arg, int mode, { struct snd_mixer *m; int ret = EINVAL, *arg_i = (int *)arg; - int v = -1, j = cmd & 0xff; + int v = -1, j = IOCNUM(cmd); /* * Certain ioctls may be made on any type of device (audio, mixer, diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 38e5b36f192f..789a9dcab9ae 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -54,9 +54,10 @@ static int vesa_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) { scr_stat *scp; - int mode; + int mode, num; scp = SC_STAT(tp); + num = IOCNUM(cmd); switch (cmd) { /* generic text modes */ @@ -65,7 +66,7 @@ vesa_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case SW_TEXT_132x60: if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; - return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0, 0); + return sc_set_text_mode(scp, tp, num, 0, 0, 0, 0); /* text modes */ case SW_VESA_C80x60: @@ -75,7 +76,7 @@ vesa_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case SW_VESA_C132x60: if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; - mode = (cmd & 0xff) + M_VESA_BASE; + mode = num + M_VESA_BASE; return sc_set_text_mode(scp, tp, mode, 0, 0, 0, 0); /* graphics modes */ @@ -101,14 +102,14 @@ vesa_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case SW_VESA_FULL_1280: if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; - mode = (cmd & 0xff) + M_VESA_BASE; + mode = num + M_VESA_BASE; return sc_set_graphics_mode(scp, tp, mode); default: if (IOCGROUP(cmd) == 'V') { if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; - mode = (cmd & 0xff) + M_VESA_BASE; + mode = num + M_VESA_BASE; if (((cmd & IOC_DIRMASK) == IOC_VOID) && (mode > M_VESA_FULL_1280) && diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index dc2951bfb11d..6bed47215ad6 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -651,7 +651,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case SW_EGAMONO80x25: if (!(adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; - return sc_set_text_mode(scp, tp, cmd & 0xff, 0, 0, 0, 0); + return sc_set_text_mode(scp, tp, IOCNUM(cmd), 0, 0, 0, 0); /* GRAPHICS MODES */ case SW_BG320: case SW_BG640: @@ -661,7 +661,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case SW_VGA_MODEX: if (!(adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; - return sc_set_graphics_mode(scp, tp, cmd & 0xff); + return sc_set_graphics_mode(scp, tp, IOCNUM(cmd)); #endif /* SC_NO_MODE_CHANGE */ #if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \ diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index f4a3cd1df9dd..232944b73131 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -332,7 +332,7 @@ ng_eiface_print_ioctl(struct ifnet *ifp, int command, caddr_t data) ifp->if_xname, str, IOCGROUP(command), - command & 0xff, + IOCNUM(command), IOCPARM_LEN(command)); } #endif /* DEBUG */ diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h index d8c2ca2ac6cc..3960983fbb90 100644 --- a/sys/sys/ioccom.h +++ b/sys/sys/ioccom.h @@ -47,6 +47,7 @@ #define IOCPARM_LEN(x) (((x) >> 16) & IOCPARM_MASK) #define IOCBASECMD(x) ((x) & ~(IOCPARM_MASK << 16)) #define IOCGROUP(x) (((x) >> 8) & 0xff) +#define IOCNUM(x) ((x) & 0xff) #define IOCPARM_MAX (1 << IOCPARM_SHIFT) /* max size of ioctl */