The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d3b253e2f7c4910bbd3844158a2a80f9a7ff4f
commit b9d3b253e2f7c4910bbd3844158a2a80f9a7ff4f Author: Emmanuel Vadot <[email protected]> AuthorDate: 2021-12-01 10:56:26 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2021-12-06 10:27:59 +0000 fb: Remove unused cursors ioctls The cursors related 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/D33217 --- sys/dev/fb/fb.c | 5 ----- sys/dev/syscons/scvidctl.c | 5 ----- sys/sys/fbio.h | 38 -------------------------------------- 3 files changed, 48 deletions(-) diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 8226c3317c6b..12423ad86f4f 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -738,11 +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 FBIOSCURSOR: - case FBIOGCURSOR: - case FBIOSCURPOS: - case FBIOGCURPOS: - case FBIOGCURMAX: case FBIOMONINFO: case FBIOGXINFO: diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index c5881545f435..7c2b395d975b 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -614,11 +614,6 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) case FBIOPUTCMAP: case FBIOGETCMAP: case FBIOGTYPE: - case FBIOSCURSOR: - case FBIOGCURSOR: - case FBIOSCURPOS: - case FBIOGCURPOS: - case FBIOGCURMAX: if (scp != scp->sc->cur_scp) return ENODEV; /* XXX */ return fb_ioctl(adp, cmd, data); diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index ff63c2f064b1..73315a37bbdd 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -195,44 +195,6 @@ struct fbcmap { #define FBIOPUTCMAP _IOW('F', 3, struct fbcmap) #define FBIOGETCMAP _IOW('F', 4, struct fbcmap) -/* - * Hardware cursor control (for, e.g., CG6). A rather complex and icky - * interface that smells like VMS, but there it is.... - */ -struct fbcurpos { - short x; - short y; -}; - -struct fbcursor { - short set; /* flags; see below */ - short enable; /* nonzero => cursor on, 0 => cursor off */ - struct fbcurpos pos; /* position on display */ - struct fbcurpos hot; /* hot-spot within cursor */ - struct fbcmap cmap; /* cursor color map */ - struct fbcurpos size; /* number of valid bits in image & mask */ - caddr_t image; /* cursor image bits */ - caddr_t mask; /* cursor mask bits */ -}; -#define FB_CUR_SETCUR 0x01 /* set on/off (i.e., obey fbcursor.enable) */ -#define FB_CUR_SETPOS 0x02 /* set position */ -#define FB_CUR_SETHOT 0x04 /* set hot-spot */ -#define FB_CUR_SETCMAP 0x08 /* set cursor color map */ -#define FB_CUR_SETSHAPE 0x10 /* set size & bits */ -#define FB_CUR_SETALL (FB_CUR_SETCUR | FB_CUR_SETPOS | FB_CUR_SETHOT | \ - FB_CUR_SETCMAP | FB_CUR_SETSHAPE) - -/* controls for cursor attributes & shape (including position) */ -#define FBIOSCURSOR _IOW('F', 24, struct fbcursor) -#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor) - -/* controls for cursor position only */ -#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos) -#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos) - -/* get maximum cursor size */ -#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos) - /* * Video board information */
