| fwdev.c (196970) | fwdev.c (201223) |
|---|---|
| 1/*- 2 * Copyright (c) 2003 Hidetoshi Shimokawa 3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa 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: --- 17 unchanged lines hidden (view full) --- 26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 32 * POSSIBILITY OF SUCH DAMAGE. 33 * | 1/*- 2 * Copyright (c) 2003 Hidetoshi Shimokawa 3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa 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: --- 17 unchanged lines hidden (view full) --- 26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 32 * POSSIBILITY OF SUCH DAMAGE. 33 * |
| 34 * $FreeBSD: head/sys/dev/firewire/fwdev.c 196970 2009-09-08 13:19:05Z phk $ | 34 * $FreeBSD: head/sys/dev/firewire/fwdev.c 201223 2009-12-29 21:51:28Z rnoland $ |
| 35 * 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/types.h> 41#include <sys/mbuf.h> 42#if defined(__DragonFly__) || __FreeBSD_version < 500000 --- 836 unchanged lines hidden (view full) --- 879 880 return revents; 881} 882 883static int 884#if defined(__DragonFly__) || __FreeBSD_version < 500102 885fw_mmap (struct cdev *dev, vm_offset_t offset, int nproto) 886#else | 35 * 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/types.h> 41#include <sys/mbuf.h> 42#if defined(__DragonFly__) || __FreeBSD_version < 500000 --- 836 unchanged lines hidden (view full) --- 879 880 return revents; 881} 882 883static int 884#if defined(__DragonFly__) || __FreeBSD_version < 500102 885fw_mmap (struct cdev *dev, vm_offset_t offset, int nproto) 886#else |
| 887fw_mmap (struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nproto) | 887fw_mmap (struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, 888 int nproto, vm_memattr_t *memattr) |
| 888#endif 889{ 890 891 if (DEV_FWMEM(dev)) 892#if defined(__DragonFly__) || __FreeBSD_version < 500102 893 return fwmem_mmap(dev, offset, nproto); 894#else | 889#endif 890{ 891 892 if (DEV_FWMEM(dev)) 893#if defined(__DragonFly__) || __FreeBSD_version < 500102 894 return fwmem_mmap(dev, offset, nproto); 895#else |
| 895 return fwmem_mmap(dev, offset, paddr, nproto); | 896 return fwmem_mmap(dev, offset, paddr, nproto, memattr); |
| 896#endif 897 898 return EINVAL; 899} 900 901static void 902fw_strategy(struct bio *bp) 903{ --- 99 unchanged lines hidden --- | 897#endif 898 899 return EINVAL; 900} 901 902static void 903fw_strategy(struct bio *bp) 904{ --- 99 unchanged lines hidden --- |