Deleted Added
full compact
vga_isa.c (111815) vga_isa.c (112569)
1/*-
2 * Copyright (c) 1999 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 AUTHORS 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) 1999 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 AUTHORS 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/isa/vga_isa.c 111815 2003-03-03 12:15:54Z phk $
26 * $FreeBSD: head/sys/isa/vga_isa.c 112569 2003-03-25 00:07:06Z jake $
27 */
28
29#include "opt_vga.h"
30#include "opt_fb.h"
31#include "opt_syscons.h" /* should be removed in the future, XXX */
32
33#include <sys/param.h>
34#include <sys/systm.h>

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

186
187static int
188isavga_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
189{
190 return vga_ioctl(dev, VGA_SOFTC(VGA_UNIT(dev)), cmd, arg, flag, td);
191}
192
193static int
27 */
28
29#include "opt_vga.h"
30#include "opt_fb.h"
31#include "opt_syscons.h" /* should be removed in the future, XXX */
32
33#include <sys/param.h>
34#include <sys/systm.h>

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

186
187static int
188isavga_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
189{
190 return vga_ioctl(dev, VGA_SOFTC(VGA_UNIT(dev)), cmd, arg, flag, td);
191}
192
193static int
194isavga_mmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot)
194isavga_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
195{
196 return vga_mmap(dev, VGA_SOFTC(VGA_UNIT(dev)), offset, paddr, prot);
197}
198
199#endif /* FB_INSTALL_CDEV */
200
201static device_method_t isavga_methods[] = {
202 DEVMETHOD(device_identify, isavga_identify),

--- 14 unchanged lines hidden ---
195{
196 return vga_mmap(dev, VGA_SOFTC(VGA_UNIT(dev)), offset, paddr, prot);
197}
198
199#endif /* FB_INSTALL_CDEV */
200
201static device_method_t isavga_methods[] = {
202 DEVMETHOD(device_identify, isavga_identify),

--- 14 unchanged lines hidden ---