From nobody Mon Dec 06 10:29:48 2021 X-Original-To: dev-commits-src-main@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 5C3D518B48C1; Mon, 6 Dec 2021 10:29: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 4J706j2hbYz4kKx; Mon, 6 Dec 2021 10:29:49 +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 D785E1EAE; Mon, 6 Dec 2021 10:29:48 +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 1B6ATmv6087431; Mon, 6 Dec 2021 10:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6ATmJ8087430; Mon, 6 Dec 2021 10:29:48 GMT (envelope-from git) Date: Mon, 6 Dec 2021 10:29:48 GMT Message-Id: <202112061029.1B6ATmJ8087430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 706f32db8aec - main - fb: Remove some unused ioctls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 706f32db8aec5d1e9e6f9210fab7be6f13ac25c3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638786589; 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=7SnY1z/Nsi3msRN5obWr4rHMH22spfh+2X53/E2cgGY=; b=vsKY0Z07bnYaGp3yqVk2xtmJ7gBqScoEjr25tyZbtcHgpIUiA4NrN+2xK3/QXiDRomSrmj l4bwGyRNajwE78kA4hfu84M7lXsKdm+stVoNQvAzbZqx78877K7xSvjdJGccbDf6VF2wC2 pQiiNHMaQD04hHxk5HxOW9mOlyPUZYYc1uOA6FTbXlxo6Nb0DsS6Jo9DL5c6MJtcHpLra9 i8B7uMmCUxcyDRDy+Kgflbe4w3uL/g6a+VcNSMzWSyBhtw8gShjL1GQPXaXZSwD9zNAKGL GQ+xPYIDwRmmtW20ydh0Ad+ZnlhfTdiUJY7LEPiXz9sDUMY1wMEJ7tG1mLuSwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638786589; a=rsa-sha256; cv=none; b=BvzR59/zJwVdGv+XY/opMaoP9AIbMyy3/63WDfvl3ye78fteawFIQDURsKwR5eQtICr1zk fPRSBF/kC5qlHJTN5SXNvxe/OBX0vNZ3wZ9kNANWJ0V0n2hEGd4daCa5paMAj0x4bHSK1p 34dFUDGsT/QvUfSpqoQ4vvo3jTBO+RJRgkYbxy5D7Z49ja5jTMufkSgfsLovbkG7Hm+I3I seTNasDvq0/LkeWlKJb4hIfh6kCQEh5HLOm1EULrG1AP3JQpuphGYZkFFTU8kXqxZAmPQG Jq2t23uTYXfop59+W2s68ofjCao9At52wMyQLMy5hxpSwPsrazcXvx8xPIM54g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=706f32db8aec5d1e9e6f9210fab7be6f13ac25c3 commit 706f32db8aec5d1e9e6f9210fab7be6f13ac25c3 Author: Emmanuel Vadot AuthorDate: 2021-12-01 10:57:42 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-06 10:28:01 +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 --- 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 73315a37bbdd..38b544801573 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -195,60 +195,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 */