Deleted Added
full compact
scvesactl.c (51654) scvesactl.c (56836)
1/*-
2 * Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
3 * All rights reserved.
4 *
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 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 *
1/*-
2 * Copyright (c) 1998 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
3 * All rights reserved.
4 *
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 unchanged lines hidden (view full) ---

18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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 * $FreeBSD: head/sys/dev/syscons/scvesactl.c 51654 1999-09-25 16:21:39Z phk $
26 * $FreeBSD: head/sys/dev/syscons/scvesactl.c 56836 2000-01-29 15:08:56Z peter $
27 */
28
27 */
28
29#include "sc.h"
30#include "vga.h"
31#include "opt_syscons.h"
32#include "opt_vga.h"
29#include "opt_vga.h"
33#include "opt_vesa.h"
34
30
35#ifdef VGA_NO_MODE_CHANGE
36#undef VESA
37#endif
31#ifndef VGA_NO_MODE_CHANGE
38
32
39#if (NSC > 0 && NVGA > 0 && defined(VESA)) || defined(KLD_MODULE)
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/conf.h>
44#include <sys/tty.h>
45#include <sys/kernel.h>
46
47#include <machine/console.h>
48#include <machine/pc/vesa.h>

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

133{
134 if (sc_user_ioctl != vesa_ioctl)
135 return EBUSY;
136 sc_user_ioctl = prev_user_ioctl;
137 prev_user_ioctl = NULL;
138 return 0;
139}
140
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/conf.h>
36#include <sys/tty.h>
37#include <sys/kernel.h>
38
39#include <machine/console.h>
40#include <machine/pc/vesa.h>

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

125{
126 if (sc_user_ioctl != vesa_ioctl)
127 return EBUSY;
128 sc_user_ioctl = prev_user_ioctl;
129 prev_user_ioctl = NULL;
130 return 0;
131}
132
141#endif /* (NSC > 0 && NVGA > 0 && VESA) || KLD_MODULE */
133#endif /* SC_NO_MODE_CHANGE */