From nobody Mon Dec 6 10:29:44 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 3556918B4903; Mon, 6 Dec 2021 10:29:45 +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 4J706c4Pj8z4kDx; Mon, 6 Dec 2021 10:29:44 +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 48C581EAD; Mon, 6 Dec 2021 10:29:44 +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 1B6ATiP0087330; Mon, 6 Dec 2021 10:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6ATi6X087329; Mon, 6 Dec 2021 10:29:44 GMT (envelope-from git) Date: Mon, 6 Dec 2021 10:29:44 GMT Message-Id: <202112061029.1B6ATi6X087329@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: f1105fb8f7a2 - main - fb: Remove unused FBIOSATTR/FBIOGATTR 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/main X-Git-Reftype: branch X-Git-Commit: f1105fb8f7a2d9db06ed5e7c31392e6ffa9f06dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638786584; 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=DO95h9PuBNpE+Xr1UgaQqjoN1X8YJD+yVJR+UOczL6w=; b=n77TiifWpMyRrxcnnwzLXgJOR5K0KphLs06mufS0T2v1zp0PxMNlSaK4QAQH2go1HfV6cY 9848WaNI941befMBz4TGNpagcMNh+djKFigBatpvCSTcYqwiMLDxQASzL/EwdM7rQfpp/R fyhW2gtXm3CY27i6H6tIw2GnurXv3leUoZKhTLa2KPMrb+XzDSnEa33aKVZzXLuGu0/n1c gd07bl7lVDUA+9y1Il7gfmMd8OcCknJcF7O73zKKxL6eYNEzknPVfBY376KoDVCMDIu0NV TUnlxM1xxPwKirhLsaGLz31FzM3KO3r2V46OqRTVze5NV62IpHzIatcLsuMfjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638786584; a=rsa-sha256; cv=none; b=rxxiiJid+rAkVinGnmXSnoGCUqJEwJappPQE1+kaWxcQjxXlPcq/AqC1CSuXPXrGXO/WCB TwbYRlDFI37AC7mJ245EQVf9/Z9QZYUAP25auDIdZVQx6BRfoVFTo2VCzRJz0wnZJaLpzB sm5SbkvpWGBoaO2ZJfq5rGNv7N7zaglCjNImrPpjfbl1jXQ3rsNqplR6cKtgp9VhfkdU+1 VKwXfdrqUHxGhxjXtFuls0L0lkhipMLhx8EHBJaW6cH2r15nN2Rw609t3RDUxd9TIrDIuA 6fkHkZ9Ow/DEC0AxB3XfGqh9cwrv1M+kFsJ3v61v2+ZcxKHN3s3sscEvXysdFQ== 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=f1105fb8f7a2d9db06ed5e7c31392e6ffa9f06dd commit f1105fb8f7a2d9db06ed5e7c31392e6ffa9f06dd Author: Emmanuel Vadot AuthorDate: 2021-12-01 10:49:57 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-06 10:27:51 +0000 fb: Remove unused FBIOSATTR/FBIOGATTR ioctls The FBIOSATTR/FBIOGATTR ioctls were added in 1994 with the 4.4 Lite import but were never implemented in either sc(4), fb(4) or vt(4). Remove it. Reviewed by: emaste, tsoome MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33215 --- sys/dev/fb/fb.c | 1 - sys/dev/syscons/scvidctl.c | 1 - sys/sys/fbio.h | 25 ------------------------- 3 files changed, 27 deletions(-) diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 98b197adde66..85a129cfe0ae 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -738,7 +738,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 FBIOGATTR: case FBIOSVIDEO: case FBIOGVIDEO: case FBIOVERTICAL: diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 07566e64a212..93b9e84b67df 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -614,7 +614,6 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case FBIOPUTCMAP: case FBIOGETCMAP: case FBIOGTYPE: - case FBIOGATTR: case FBIOSVIDEO: case FBIOGVIDEO: case FBIOSCURSOR: diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index c13ef43d2fb9..bfd4dca79dce 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -195,31 +195,6 @@ struct fbcmap { #define FBIOPUTCMAP _IOW('F', 3, struct fbcmap) #define FBIOGETCMAP _IOW('F', 4, struct fbcmap) -/* - * Set/get attributes. - */ -#define FB_ATTR_NDEVSPECIFIC 8 /* no. of device specific values */ -#define FB_ATTR_NEMUTYPES 4 /* no. of emulation types */ - -struct fbsattr { - int flags; /* flags; see below */ - int emu_type; /* emulation type (-1 if unused) */ - int dev_specific[FB_ATTR_NDEVSPECIFIC]; /* catchall */ -}; -#define FB_ATTR_AUTOINIT 1 /* emulation auto init flag */ -#define FB_ATTR_DEVSPECIFIC 2 /* dev. specific stuff valid flag */ - -struct fbgattr { - int real_type; /* real device type */ - int owner; /* PID of owner, 0 if myself */ - struct fbtype fbtype; /* fbtype info for real device */ - struct fbsattr sattr; /* see above */ - int emu_types[FB_ATTR_NEMUTYPES]; /* possible emulations */ - /* (-1 if unused) */ -}; -#define FBIOSATTR _IOW('F', 5, struct fbsattr) -#define FBIOGATTR _IOR('F', 6, struct fbgattr) - /* * Video control. */