Date: Mon, 6 Dec 2021 10:29:44 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f1105fb8f7a2 - main - fb: Remove unused FBIOSATTR/FBIOGATTR ioctls Message-ID: <202112061029.1B6ATi6X087329@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f1105fb8f7a2d9db06ed5e7c31392e6ffa9f06dd commit f1105fb8f7a2d9db06ed5e7c31392e6ffa9f06dd Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-12-01 10:49:57 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> 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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112061029.1B6ATi6X087329>