| vga.c (197185) | vga.c (201223) |
|---|---|
| 1/*- 2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> 3 * Copyright (c) 1992-1998 S�ren Schmidt 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 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) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> 3 * Copyright (c) 1992-1998 S�ren Schmidt 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 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/fb/vga.c 197185 2009-09-14 05:38:03Z delphij $"); | 32__FBSDID("$FreeBSD: head/sys/dev/fb/vga.c 201223 2009-12-29 21:51:28Z rnoland $"); |
| 33 34#include "opt_vga.h" 35#include "opt_fb.h" 36#ifndef FB_DEBUG 37#define FB_DEBUG 0 38#endif 39#include "opt_syscons.h" /* should be removed in the future, XXX */ 40 --- 98 unchanged lines hidden (view full) --- 139int 140vga_ioctl(struct cdev *dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, 141 struct thread *td) 142{ 143 return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, td); 144} 145 146int | 33 34#include "opt_vga.h" 35#include "opt_fb.h" 36#ifndef FB_DEBUG 37#define FB_DEBUG 0 38#endif 39#include "opt_syscons.h" /* should be removed in the future, XXX */ 40 --- 98 unchanged lines hidden (view full) --- 139int 140vga_ioctl(struct cdev *dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, 141 struct thread *td) 142{ 143 return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, td); 144} 145 146int |
| 147vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_offset_t offset, vm_offset_t *paddr, 148 int prot) | 147vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_ooffset_t offset, 148 vm_offset_t *paddr, int prot, vm_memattr_t *memattr) |
| 149{ | 149{ |
| 150 return genfbmmap(&sc->gensc, sc->adp, offset, paddr, prot); | 150 return genfbmmap(&sc->gensc, sc->adp, offset, paddr, prot, memattr); |
| 151} 152 153#endif /* FB_INSTALL_CDEV */ 154 155/* LOW-LEVEL */ 156 157#include <isa/rtc.h> 158#ifdef __i386__ --- 2301 unchanged lines hidden (view full) --- 2460 2461/* 2462 * mmap(): 2463 * Mmap frame buffer. 2464 * 2465 * all adapters 2466 */ 2467static int | 151} 152 153#endif /* FB_INSTALL_CDEV */ 154 155/* LOW-LEVEL */ 156 157#include <isa/rtc.h> 158#ifdef __i386__ --- 2301 unchanged lines hidden (view full) --- 2460 2461/* 2462 * mmap(): 2463 * Mmap frame buffer. 2464 * 2465 * all adapters 2466 */ 2467static int |
| 2468vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, 2469 int prot) | 2468vga_mmap_buf(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, 2469 int prot, vm_memattr_t *memattr) |
| 2470{ 2471 if (adp->va_info.vi_flags & V_INFO_LINEAR) 2472 return -1; 2473 2474#if VGA_DEBUG > 0 2475 printf("vga_mmap_buf(): window:0x%jx, offset:0x%jx\n", 2476 (uintmax_t)adp->va_info.vi_window, (uintmax_t)offset); 2477#endif --- 591 unchanged lines hidden --- | 2470{ 2471 if (adp->va_info.vi_flags & V_INFO_LINEAR) 2472 return -1; 2473 2474#if VGA_DEBUG > 0 2475 printf("vga_mmap_buf(): window:0x%jx, offset:0x%jx\n", 2476 (uintmax_t)adp->va_info.vi_window, (uintmax_t)offset); 2477#endif --- 591 unchanged lines hidden --- |