| scvesactl.c (149640) | scvesactl.c (158687) |
|---|---|
| 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 * 8 * Redistribution and use in source and binary forms, with or without --- 15 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> | 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 * 8 * Redistribution and use in source and binary forms, with or without --- 15 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> |
| 32__FBSDID("$FreeBSD: head/sys/dev/syscons/scvesactl.c 149640 2005-08-30 18:58:17Z rodrigc $"); | 32__FBSDID("$FreeBSD: head/sys/dev/syscons/scvesactl.c 158687 2006-05-17 09:33:15Z phk $"); |
| 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> --- 69 unchanged lines hidden (view full) --- 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 | 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> --- 69 unchanged lines hidden (view full) --- 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 /* Only set graphics mode in non-pcvt case */ | |
| 119 if (((cmd & IOC_DIRMASK) == IOC_VOID) && 120 (mode > M_VESA_FULL_1280) && 121 (mode < M_VESA_MODE_MAX)) 122 return sc_set_graphics_mode(scp, tp, mode); 123 } 124 } 125 126 if (prev_user_ioctl) --- 26 unchanged lines hidden --- | 118 if (((cmd & IOC_DIRMASK) == IOC_VOID) && 119 (mode > M_VESA_FULL_1280) && 120 (mode < M_VESA_MODE_MAX)) 121 return sc_set_graphics_mode(scp, tp, mode); 122 } 123 } 124 125 if (prev_user_ioctl) --- 26 unchanged lines hidden --- |