From nobody Tue Dec 21 09:21:47 2021 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 BEB5018F3990; Tue, 21 Dec 2021 09:21:50 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJ9vJ4Nv3z4Rtb; Tue, 21 Dec 2021 09:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDFA9272A7; Tue, 21 Dec 2021 09:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BL9LlBr092676; Tue, 21 Dec 2021 09:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL9LlCH092675; Tue, 21 Dec 2021 09:21:47 GMT (envelope-from git) Date: Tue, 21 Dec 2021 09:21:47 GMT Message-Id: <202112210921.1BL9LlCH092675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 0c543a654125 - stable/13 - fb: Remove some unused ioctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c543a654125b5b82ed8fe61c74bb94ced75325c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640078510; 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=4XymEc9wYIx3pmL49Fw+CuXEFh+9FIl0q5VMdqT7IZE=; b=rSmZR5pE+kAhM7wqnQRHygY0dweMQHqrN0Suit1ErnyHXBg4QgnuxHAb3SX93o7DepFmj8 NJUT7A+jCOn1q+aZrDjLX88xON95GXFZ5DfrfuMR4v+6VsFUhH3Tfo2iBt5IE8BJ+ruC3u g0n7MnO+4iahbtrFe7NV2Bpm9TP1GSHSVOmW/NdzGJ28iLnGuU8nSSEvddPsCdOu/puX4i tAjTMQiH6Y7Yzlfquvux4q32Gs/Q8vFZLfvzlXPgYwWNqwFPxRf7lH9tMfJYRvRiRbJUdV wl6gMTAfgQueje9GsbZepgudQUZRNqaFOIKOhgOnCR0BZ+nqnuDoWXPaY4b58Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640078510; a=rsa-sha256; cv=none; b=ZDcD3BQPwPM4mB8adqyTXXfmcjiC6FNVTT5H5fPMPF5w5NY5+wVSEbx0sD8TOpjb7Dz2/A Gm3zWGLvW7bcsCK1wJuwPAslBwG2Fkbe50O5YKeqF8MqY/38f+/3eOBHZpfT49qjCU/gRV zqBjvjwNgi4xRhwOH+DozhDtY1/JbEyd8+dxB7Uw2oJTniaYffjQ6VHfyssJp/Ij1+Wb5W Hoaq0NjaMvXE40QmmoYqufSUwI8G8C7WIeMlTwR3I/RkSLyLGLpkOLs/3YcrHZdSEFQcay hJ43mR5DeD9PxOps/ru3w0Twagzyqh2sYf1y3LEP+mOZA4mi14tlSxRAvkJk+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0c543a654125b5b82ed8fe61c74bb94ced75325c commit 0c543a654125b5b82ed8fe61c74bb94ced75325c Author: Emmanuel Vadot AuthorDate: 2021-12-01 10:57:42 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-21 09:21:26 +0000 fb: Remove some unused ioctls 6d1699583d7e added the FBIOGXINFO,FBIOMONINFO and FBIOPUTCMAPI/FBIOGETCMAPI ioctls and said that implementation in driver will come later. Since it was in 2001 I think we can remove this. Reviewed by: emaste, imp, tsoome MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33218 Differential Revision: https://reviews.freebsd.org/D33219 Differential Revision: https://reviews.freebsd.org/D33220 (cherry picked from commit 706f32db8aec5d1e9e6f9210fab7be6f13ac25c3) --- sys/dev/fb/fb.c | 4 ---- sys/sys/fbio.h | 54 ------------------------------------------------------ 2 files changed, 58 deletions(-) diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 12423ad86f4f..95b7a30391cf 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -729,8 +729,6 @@ fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) case FBIOPUTCMAP: case FBIOGETCMAP: - case FBIOPUTCMAPI: - case FBIOGETCMAPI: /* XXX */ case FBIO_SETWINORG: /* set frame buffer window origin */ @@ -738,8 +736,6 @@ fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) case FBIO_SETLINEWIDTH: /* set scan line width in pixel */ case FBIOGTYPE: - case FBIOMONINFO: - case FBIOGXINFO: default: error = ENODEV; diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index 6b618777e84a..1e04bc758134 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -184,60 +184,6 @@ struct fbcmap { #define FBIOPUTCMAP _IOW('F', 3, struct fbcmap) #define FBIOGETCMAP _IOW('F', 4, struct fbcmap) -/* - * Video board information - */ -struct brd_info { - u_short accessible_width; /* accessible bytes in scanline */ - u_short accessible_height; /* number of accessible scanlines */ - u_short line_bytes; /* number of bytes/scanline */ - u_short hdb_capable; /* can this thing hardware db? */ - u_short vmsize; /* video memory size */ - u_char boardrev; /* board revision # */ - u_char pad0; - u_long pad1; -}; -#define FBIOGXINFO _IOR('F', 39, struct brd_info) - -/* - * Monitor information - */ -struct mon_info { - u_long mon_type; /* bit array */ -#define MON_TYPE_STEREO 0x8 /* stereo display */ -#define MON_TYPE_0_OFFSET 0x4 /* black level 0 ire instead of 7.5 */ -#define MON_TYPE_OVERSCAN 0x2 /* overscan */ -#define MON_TYPE_GRAY 0x1 /* greyscale monitor */ - u_long pixfreq; /* pixel frequency in Hz */ - u_long hfreq; /* horizontal freq in Hz */ - u_long vfreq; /* vertical freq in Hz */ - u_long vsync; /* vertical sync in scanlines */ - u_long hsync; /* horizontal sync in pixels */ - /* these are in pixel units */ - u_short hfporch; /* horizontal front porch */ - u_short hbporch; /* horizontal back porch */ - u_short vfporch; /* vertical front porch */ - u_short vbporch; /* vertical back porch */ -}; -#define FBIOMONINFO _IOR('F', 40, struct mon_info) - -/* - * Color map I/O. - */ -struct fbcmap_i { - unsigned int flags; -#define FB_CMAP_BLOCK (1 << 0) /* wait for vertical refresh */ -#define FB_CMAP_KERNEL (1 << 1) /* called within kernel */ - int id; /* color map id */ - int index; /* first element (0 origin) */ - int count; /* number of elements */ - u_char *red; /* red color map elements */ - u_char *green; /* green color map elements */ - u_char *blue; /* blue color map elements */ -}; -#define FBIOPUTCMAPI _IOW('F', 41, struct fbcmap_i) -#define FBIOGETCMAPI _IOW('F', 42, struct fbcmap_i) - /* The new style frame buffer ioctls. */ /* video mode information block */