Deleted Added
full compact
scvesactl.c (130585) scvesactl.c (146736)
1/*-
2 * Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
3 * All rights reserved.
4 *
1/*-
2 * Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The DragonFly Project
6 * by Sascha Wildner <saw@online.de>
7 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer as
10 * the first lines of this file unmodified.
11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the

--- 8 unchanged lines hidden (view full) ---

21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 *
26 */
27
28#include <sys/cdefs.h>
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer as
13 * the first lines of this file unmodified.
14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in the

--- 8 unchanged lines hidden (view full) ---

24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 */
30
31#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/dev/syscons/scvesactl.c 130585 2004-06-16 09:47:26Z phk $");
32__FBSDID("$FreeBSD: head/sys/dev/syscons/scvesactl.c 146736 2005-05-29 08:43:44Z delphij $");
30
31#include "opt_vga.h"
32
33#ifndef VGA_NO_MODE_CHANGE
34
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/conf.h>

--- 62 unchanged lines hidden (view full) ---

100
101 case SW_VESA_1280x1024: case SW_VESA_CG1280x1024:
102 case SW_VESA_32K_1280: case SW_VESA_64K_1280:
103 case SW_VESA_FULL_1280:
104 if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE))
105 return ENODEV;
106 mode = (cmd & 0xff) + M_VESA_BASE;
107 return sc_set_graphics_mode(scp, tp, mode);
33
34#include "opt_vga.h"
35
36#ifndef VGA_NO_MODE_CHANGE
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/conf.h>

--- 62 unchanged lines hidden (view full) ---

103
104 case SW_VESA_1280x1024: case SW_VESA_CG1280x1024:
105 case SW_VESA_32K_1280: case SW_VESA_64K_1280:
106 case SW_VESA_FULL_1280:
107 if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE))
108 return ENODEV;
109 mode = (cmd & 0xff) + M_VESA_BASE;
110 return sc_set_graphics_mode(scp, tp, mode);
111 default:
112 if (IOCGROUP(cmd) == 'V') {
113 if (!(scp->sc->adp->va_flags & V_ADP_MODECHANGE))
114 return ENODEV;
115
116 mode = (cmd & 0xff) + M_VESA_BASE;
117
118 if ((mode > M_VESA_FULL_1280) &&
119 (mode < M_VESA_MODE_MAX))
120 return sc_set_graphics_mode(scp, tp, mode);
121 }
108 }
109
110 if (prev_user_ioctl)
111 return (*prev_user_ioctl)(dev, cmd, data, flag, td);
112 else
113 return ENOIOCTL;
114}
115

--- 21 unchanged lines hidden ---
122 }
123
124 if (prev_user_ioctl)
125 return (*prev_user_ioctl)(dev, cmd, data, flag, td);
126 else
127 return ENOIOCTL;
128}
129

--- 21 unchanged lines hidden ---