From 1da88f842bacb7598b37910a4c71948f127050f2 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 28 Jan 2005 20:17:18 +0000 Subject: [PATCH 1/1] Remove some old ioctls and structs which were there for backwards compatibility with FreeBSD 3.x. --- sys/dev/misc/syscons/scmouse.c | 53 +------------ sys/dev/misc/syscons/scvidctl.c | 131 +------------------------------- 2 files changed, 2 insertions(+), 182 deletions(-) diff --git a/sys/dev/misc/syscons/scmouse.c b/sys/dev/misc/syscons/scmouse.c index ca34ab7c95..71f215e5d9 100644 --- a/sys/dev/misc/syscons/scmouse.c +++ b/sys/dev/misc/syscons/scmouse.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.12.2.3 2001/07/28 12:51:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scmouse.c,v 1.5 2004/05/13 19:44:33 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scmouse.c,v 1.6 2005/01/28 20:17:18 swildner Exp $ */ #include "opt_syscons.h" @@ -52,23 +52,6 @@ #define SC_WAKEUP_DELTA 20 -/* for backward compatibility */ -#define OLD_CONS_MOUSECTL _IOWR('c', 10, old_mouse_info_t) - -typedef struct old_mouse_data { - int x; - int y; - int buttons; -} old_mouse_data_t; - -typedef struct old_mouse_info { - int operation; - union { - struct old_mouse_data data; - struct mouse_mode mode; - } u; -} old_mouse_info_t; - #ifndef SC_NO_SYSMOUSE /* local variables */ @@ -601,7 +584,6 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread *td) { mouse_info_t *mouse; - mouse_info_t buf; scr_stat *cur_scp; scr_stat *scp; int s; @@ -612,40 +594,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, switch (cmd) { case CONS_MOUSECTL: /* control mouse arrow */ - case OLD_CONS_MOUSECTL: - mouse = (mouse_info_t*)data; - if (cmd == OLD_CONS_MOUSECTL) { - static u_char swapb[] = { 0, 4, 2, 6, 1, 5, 3, 7 }; - old_mouse_info_t *old_mouse = (old_mouse_info_t *)data; - - mouse = &buf; - mouse->operation = old_mouse->operation; - switch (mouse->operation) { - case MOUSE_MODE: - mouse->u.mode = old_mouse->u.mode; - break; - case MOUSE_SHOW: - case MOUSE_HIDE: - break; - case MOUSE_MOVEABS: - case MOUSE_MOVEREL: - case MOUSE_ACTION: - mouse->u.data.x = old_mouse->u.data.x; - mouse->u.data.y = old_mouse->u.data.y; - mouse->u.data.z = 0; - mouse->u.data.buttons = swapb[old_mouse->u.data.buttons & 0x7]; - break; - case MOUSE_GETINFO: - old_mouse->u.data.x = scp->mouse_xpos; - old_mouse->u.data.y = scp->mouse_ypos; - old_mouse->u.data.buttons = swapb[scp->mouse_buttons & 0x7]; - return 0; - default: - return EINVAL; - } - } - cur_scp = scp->sc->cur_scp; switch (mouse->operation) { diff --git a/sys/dev/misc/syscons/scvidctl.c b/sys/dev/misc/syscons/scvidctl.c index e439e3fc87..47aaf4d398 100644 --- a/sys/dev/misc/syscons/scvidctl.c +++ b/sys/dev/misc/syscons/scvidctl.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.19.2.2 2000/05/05 09:16:08 nyan Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scvidctl.c,v 1.6 2004/09/04 06:15:08 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scvidctl.c,v 1.7 2005/01/28 20:17:18 swildner Exp $ */ #include "opt_syscons.h" @@ -46,86 +46,6 @@ SET_DECLARE(scrndr_set, const sc_renderer_t); -/* for compatibility with previous versions */ -/* 3.0-RELEASE used the following structure */ -typedef struct old_video_adapter { - int va_index; - int va_type; - int va_flags; -/* flag bits are the same as the -CURRENT -#define V_ADP_COLOR (1<<0) -#define V_ADP_MODECHANGE (1<<1) -#define V_ADP_STATESAVE (1<<2) -#define V_ADP_STATELOAD (1<<3) -#define V_ADP_FONT (1<<4) -#define V_ADP_PALETTE (1<<5) -#define V_ADP_BORDER (1<<6) -#define V_ADP_VESA (1<<7) -*/ - int va_crtc_addr; - u_int va_window; /* virtual address */ - size_t va_window_size; - size_t va_window_gran; - u_int va_buffer; /* virtual address */ - size_t va_buffer_size; - int va_initial_mode; - int va_initial_bios_mode; - int va_mode; -} old_video_adapter_t; - -#define OLD_CONS_ADPINFO _IOWR('c', 101, old_video_adapter_t) - -/* 3.1-RELEASE used the following structure */ -typedef struct old_video_adapter_info { - int va_index; - int va_type; - char va_name[16]; - int va_unit; - int va_flags; - int va_io_base; - int va_io_size; - int va_crtc_addr; - int va_mem_base; - int va_mem_size; - u_int va_window; /* virtual address */ - size_t va_window_size; - size_t va_window_gran; - u_int va_buffer;; - size_t va_buffer_size; - int va_initial_mode; - int va_initial_bios_mode; - int va_mode; - int va_line_width; -} old_video_adapter_info_t; - -#define OLD_CONS_ADPINFO2 _IOWR('c', 101, old_video_adapter_info_t) - -/* 3.0-RELEASE and 3.1-RELEASE used the following structure */ -typedef struct old_video_info { - int vi_mode; - int vi_flags; -/* flag bits are the same as the -CURRENT -#define V_INFO_COLOR (1<<0) -#define V_INFO_GRAPHICS (1<<1) -#define V_INFO_LINEAR (1<<2) -#define V_INFO_VESA (1<<3) -*/ - int vi_width; - int vi_height; - int vi_cwidth; - int vi_cheight; - int vi_depth; - int vi_planes; - u_int vi_window; /* physical address */ - size_t vi_window_size; - size_t vi_window_gran; - u_int vi_buffer; /* physical address */ - size_t vi_buffer_size; -} old_video_info_t; - -#define OLD_CONS_MODEINFO _IOWR('c', 102, old_video_info_t) -#define OLD_CONS_FINDMODE _IOWR('c', 103, old_video_info_t) - int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize, int fontsize) @@ -457,7 +377,6 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread * scr_stat *scp; video_adapter_t *adp; video_info_t info; - video_adapter_info_t adp_info; int error; int s; @@ -478,39 +397,6 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread * case FBIO_ADPTYPE: return fb_ioctl(adp, FBIO_ADPTYPE, data); - case OLD_CONS_ADPINFO: /* adapter information (old interface) */ - if (((old_video_adapter_t *)data)->va_index >= 0) { - adp = vid_get_adapter(((old_video_adapter_t *)data)->va_index); - if (adp == NULL) - return ENODEV; - } - ((old_video_adapter_t *)data)->va_index = adp->va_index; - ((old_video_adapter_t *)data)->va_type = adp->va_type; - ((old_video_adapter_t *)data)->va_flags = adp->va_flags; - ((old_video_adapter_t *)data)->va_crtc_addr = adp->va_crtc_addr; - ((old_video_adapter_t *)data)->va_window = adp->va_window; - ((old_video_adapter_t *)data)->va_window_size = adp->va_window_size; - ((old_video_adapter_t *)data)->va_window_gran = adp->va_window_gran; - ((old_video_adapter_t *)data)->va_buffer = adp->va_buffer; - ((old_video_adapter_t *)data)->va_buffer_size = adp->va_buffer_size; - ((old_video_adapter_t *)data)->va_mode = adp->va_mode; - ((old_video_adapter_t *)data)->va_initial_mode = adp->va_initial_mode; - ((old_video_adapter_t *)data)->va_initial_bios_mode - = adp->va_initial_bios_mode; - return 0; - - case OLD_CONS_ADPINFO2: /* adapter information (yet another old I/F) */ - adp_info.va_index = ((old_video_adapter_info_t *)data)->va_index; - if (adp_info.va_index >= 0) { - adp = vid_get_adapter(adp_info.va_index); - if (adp == NULL) - return ENODEV; - } - error = fb_ioctl(adp, FBIO_ADPINFO, &adp_info); - if (error == 0) - bcopy(&adp_info, data, sizeof(old_video_adapter_info_t)); - return error; - case CONS_ADPINFO: /* adapter information */ case FBIO_ADPINFO: if (((video_adapter_info_t *)data)->va_index >= 0) { @@ -539,25 +425,10 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct thread * return sc_set_text_mode(scp, tp, *(int *)data, 0, 0, 0); #endif /* SC_NO_MODE_CHANGE */ - case OLD_CONS_MODEINFO: /* get mode information (old infterface) */ - info.vi_mode = ((old_video_info_t *)data)->vi_mode; - error = fb_ioctl(adp, FBIO_MODEINFO, &info); - if (error == 0) - bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t)); - return error; - case CONS_MODEINFO: /* get mode information */ case FBIO_MODEINFO: return fb_ioctl(adp, FBIO_MODEINFO, data); - case OLD_CONS_FINDMODE: /* find a matching video mode (old interface) */ - bzero(&info, sizeof(info)); - bcopy((old_video_info_t *)data, &info, sizeof(old_video_info_t)); - error = fb_ioctl(adp, FBIO_FINDMODE, &info); - if (error == 0) - bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t)); - return error; - case CONS_FINDMODE: /* find a matching video mode */ case FBIO_FINDMODE: return fb_ioctl(adp, FBIO_FINDMODE, data); -- 2.41.0