fb.c (183397) | fb.c (201223) |
---|---|
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 --- 13 unchanged lines hidden (view full) --- 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> | 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 --- 13 unchanged lines hidden (view full) --- 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> |
30__FBSDID("$FreeBSD: head/sys/dev/fb/fb.c 183397 2008-09-27 08:51:18Z ed $"); | 30__FBSDID("$FreeBSD: head/sys/dev/fb/fb.c 201223 2009-12-29 21:51:28Z rnoland $"); |
31 32#include "opt_fb.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/conf.h> 37#include <sys/bus.h> 38#include <sys/kernel.h> --- 467 unchanged lines hidden (view full) --- 506 if (adp == NULL) /* XXX */ 507 return ENXIO; 508 error = vidd_ioctl(adp, cmd, arg); 509 if (error == ENOIOCTL) 510 error = ENODEV; 511 return error; 512} 513 | 31 32#include "opt_fb.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/conf.h> 37#include <sys/bus.h> 38#include <sys/kernel.h> --- 467 unchanged lines hidden (view full) --- 506 if (adp == NULL) /* XXX */ 507 return ENXIO; 508 error = vidd_ioctl(adp, cmd, arg); 509 if (error == ENOIOCTL) 510 error = ENODEV; 511 return error; 512} 513 |
514int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_offset_t offset, 515 vm_offset_t *paddr, int prot) | 514int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_ooffset_t offset, 515 vm_offset_t *paddr, int prot, vm_memattr_t *memattr) |
516{ | 516{ |
517 return vidd_mmap(adp, offset, paddr, prot); | 517 return vidd_mmap(adp, offset, paddr, prot, memattr); |
518} 519 520#endif /* FB_INSTALL_CDEV */ 521 522static char 523*adapter_name(int type) 524{ 525 static struct { --- 236 unchanged lines hidden --- | 518} 519 520#endif /* FB_INSTALL_CDEV */ 521 522static char 523*adapter_name(int type) 524{ 525 static struct { --- 236 unchanged lines hidden --- |