The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=706f32db8aec5d1e9e6f9210fab7be6f13ac25c3
commit 706f32db8aec5d1e9e6f9210fab7be6f13ac25c3 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2021-12-01 10:57:42 +0000 Commit: Emmanuel Vadot <[email protected]> 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 */
