diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/adlink/adlink.c | 3 | ||||
-rw-r--r-- | sys/dev/agp/agp.c | 3 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_os.c | 3 | ||||
-rw-r--r-- | sys/dev/drm/drm_vm.c | 4 | ||||
-rw-r--r-- | sys/dev/fb/creator.c | 8 | ||||
-rw-r--r-- | sys/dev/fb/fb.c | 6 | ||||
-rw-r--r-- | sys/dev/fb/fbreg.h | 12 | ||||
-rw-r--r-- | sys/dev/fb/machfb.c | 4 | ||||
-rw-r--r-- | sys/dev/fb/s3_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/fb/vesa.c | 8 | ||||
-rw-r--r-- | sys/dev/fb/vga.c | 10 | ||||
-rw-r--r-- | sys/dev/fb/vgareg.h | 4 | ||||
-rw-r--r-- | sys/dev/firewire/fwdev.c | 5 | ||||
-rw-r--r-- | sys/dev/firewire/fwmem.c | 3 | ||||
-rw-r--r-- | sys/dev/hifn/hifn7751.c | 7 | ||||
-rw-r--r-- | sys/dev/ksyms/ksyms.c | 4 | ||||
-rw-r--r-- | sys/dev/sound/pcm/dsp.c | 3 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 5 | ||||
-rw-r--r-- | sys/dev/tdfx/tdfx_pci.c | 3 |
19 files changed, 56 insertions, 45 deletions
diff --git a/sys/dev/adlink/adlink.c b/sys/dev/adlink/adlink.c index 3568e8f..2d98f89 100644 --- a/sys/dev/adlink/adlink.c +++ b/sys/dev/adlink/adlink.c @@ -161,7 +161,8 @@ adlink_intr(void *arg) } static int -adlink_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +adlink_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr) { struct softc *sc; vm_offset_t o; diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index db78561..53399e2 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -868,7 +868,8 @@ agp_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int fflag, struct thread } static int -agp_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +agp_mmap(struct cdev *kdev, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { device_t dev = kdev->si_drv1; struct agp_softc *sc = device_get_softc(dev); diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 327c4bb..b667700 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -794,7 +794,8 @@ bktr_ioctl( struct cdev *dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct thr * */ static int -bktr_mmap( struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot ) +bktr_mmap( struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr ) { int unit; bktr_ptr_t bktr; diff --git a/sys/dev/drm/drm_vm.c b/sys/dev/drm/drm_vm.c index 7d5cd8d..8f260fd 100644 --- a/sys/dev/drm/drm_vm.c +++ b/sys/dev/drm/drm_vm.c @@ -31,8 +31,8 @@ __FBSDID("$FreeBSD$"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -int drm_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +int drm_mmap(struct cdev *kdev, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { struct drm_device *dev = drm_get_device_from_kdev(kdev); struct drm_file *file_priv = NULL; diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c index 3abaa1d..135fd3d 100644 --- a/sys/dev/fb/creator.c +++ b/sys/dev/fb/creator.c @@ -692,8 +692,8 @@ creator_blank_display(video_adapter_t *adp, int mode) } static int -creator_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +creator_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { return (EINVAL); @@ -1048,8 +1048,8 @@ creator_fb_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, } static int -creator_fb_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +creator_fb_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { struct creator_softc *sc; int i; diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 21871f6..09fcebc 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -511,10 +511,10 @@ int genfbioctl(genfb_softc_t *sc, video_adapter_t *adp, u_long cmd, return error; } -int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_offset_t offset, - vm_offset_t *paddr, int prot) +int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_ooffset_t offset, + vm_offset_t *paddr, int prot, vm_memattr_t *memattr) { - return vidd_mmap(adp, offset, paddr, prot); + return vidd_mmap(adp, offset, paddr, prot, memattr); } #endif /* FB_INSTALL_CDEV */ diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h index 0be91d3..aabe3e3 100644 --- a/sys/dev/fb/fbreg.h +++ b/sys/dev/fb/fbreg.h @@ -131,8 +131,8 @@ typedef int vi_blank_display_t(video_adapter_t *adp, int mode); #define V_DISPLAY_STAND_BY 2 #define V_DISPLAY_SUSPEND 3 */ -typedef int vi_mmap_t(video_adapter_t *adp, vm_offset_t offset, - vm_paddr_t *paddr, int prot); +typedef int vi_mmap_t(video_adapter_t *adp, vm_ooffset_t offset, + vm_paddr_t *paddr, int prot, vm_memattr_t *memattr); typedef int vi_ioctl_t(video_adapter_t *adp, u_long cmd, caddr_t data); typedef int vi_clear_t(video_adapter_t *adp); typedef int vi_fill_rect_t(video_adapter_t *adp, int val, int x, int y, @@ -228,8 +228,9 @@ typedef struct video_switch { (height), (celsize), (blink)) #define vidd_blank_display(adp, mode) \ (*vidsw[(adp)->va_index]->blank_display)((adp), (mode)) -#define vidd_mmap(adp, offset, paddr, prot) \ - (*vidsw[(adp)->va_index]->mmap)((adp), (offset), (paddr), (prot)) +#define vidd_mmap(adp, offset, paddr, prot, memattr) \ + (*vidsw[(adp)->va_index]->mmap)((adp), (offset), (paddr), \ + (prot), (memattr)) #define vidd_ioctl(adp, cmd, data) \ (*vidsw[(adp)->va_index]->ioctl)((adp), (cmd), (data)) #define vidd_clear(adp) \ @@ -317,7 +318,8 @@ int genfbwrite(genfb_softc_t *sc, video_adapter_t *adp, int genfbioctl(genfb_softc_t *sc, video_adapter_t *adp, u_long cmd, caddr_t arg, int flag, struct thread *td); int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, - vm_offset_t offset, vm_offset_t *paddr, int prot); + vm_ooffset_t offset, vm_offset_t *paddr, + int prot, vm_memattr_t *memattr); #endif /* FB_INSTALL_CDEV */ diff --git a/sys/dev/fb/machfb.c b/sys/dev/fb/machfb.c index a9574f3..dad41d8 100644 --- a/sys/dev/fb/machfb.c +++ b/sys/dev/fb/machfb.c @@ -837,8 +837,8 @@ machfb_blank_display(video_adapter_t *adp, int mode) } static int -machfb_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +machfb_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { struct machfb_softc *sc; video_info_t *vi; diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c index cfddf30..cd70774 100644 --- a/sys/dev/fb/s3_pci.c +++ b/sys/dev/fb/s3_pci.c @@ -388,10 +388,10 @@ s3lfb_blank_display(video_adapter_t *adp, int mode) } static int -s3lfb_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +s3lfb_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { - return (*prevvidsw->mmap)(adp, offset, paddr, prot); + return (*prevvidsw->mmap)(adp, offset, paddr, prot, memattr); } static int diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c index 13f03f7..96b9943 100644 --- a/sys/dev/fb/vesa.c +++ b/sys/dev/fb/vesa.c @@ -1528,12 +1528,12 @@ vesa_blank_display(video_adapter_t *adp, int mode) } static int -vesa_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +vesa_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { #if VESA_DEBUG > 0 - printf("vesa_mmap(): window:0x%tx, buffer:0x%tx, offset:0x%tx\n", + printf("vesa_mmap(): window:0x%tx, buffer:0x%tx, offset:0x%jx\n", adp->va_info.vi_window, adp->va_info.vi_buffer, offset); #endif @@ -1546,7 +1546,7 @@ vesa_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, *paddr = adp->va_info.vi_buffer + offset; return (0); } - return ((*prevvidsw->mmap)(adp, offset, paddr, prot)); + return ((*prevvidsw->mmap)(adp, offset, paddr, prot, memattr)); } static int diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 0cae0ae..7d702ad 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -144,10 +144,10 @@ vga_ioctl(struct cdev *dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, } int -vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_offset_t offset, vm_offset_t *paddr, - int prot) +vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_ooffset_t offset, + vm_offset_t *paddr, int prot, vm_memattr_t *memattr) { - return genfbmmap(&sc->gensc, sc->adp, offset, paddr, prot); + return genfbmmap(&sc->gensc, sc->adp, offset, paddr, prot, memattr); } #endif /* FB_INSTALL_CDEV */ @@ -2465,8 +2465,8 @@ vga_blank_display(video_adapter_t *adp, int mode) * all adapters */ static int -vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +vga_mmap_buf(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { if (adp->va_info.vi_flags & V_INFO_LINEAR) return -1; diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h index fa9d44e..249d32c 100644 --- a/sys/dev/fb/vgareg.h +++ b/sys/dev/fb/vgareg.h @@ -88,8 +88,8 @@ int vga_read(struct cdev *dev, vga_softc_t *sc, struct uio *uio, int flag); int vga_write(struct cdev *dev, vga_softc_t *sc, struct uio *uio, int flag); int vga_ioctl(struct cdev *dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag, struct thread *td); -int vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_offset_t offset, - vm_offset_t *paddr, int prot); +int vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_ooffset_t offset, + vm_offset_t *paddr, int prot, vm_memattr_t *memattr); #endif extern int (*vga_sub_configure)(int flags); diff --git a/sys/dev/firewire/fwdev.c b/sys/dev/firewire/fwdev.c index 0facb6e..1475d00 100644 --- a/sys/dev/firewire/fwdev.c +++ b/sys/dev/firewire/fwdev.c @@ -884,7 +884,8 @@ static int #if defined(__DragonFly__) || __FreeBSD_version < 500102 fw_mmap (struct cdev *dev, vm_offset_t offset, int nproto) #else -fw_mmap (struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nproto) +fw_mmap (struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nproto, vm_memattr_t *memattr) #endif { @@ -892,7 +893,7 @@ fw_mmap (struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nproto) #if defined(__DragonFly__) || __FreeBSD_version < 500102 return fwmem_mmap(dev, offset, nproto); #else - return fwmem_mmap(dev, offset, paddr, nproto); + return fwmem_mmap(dev, offset, paddr, nproto, memattr); #endif return EINVAL; diff --git a/sys/dev/firewire/fwmem.c b/sys/dev/firewire/fwmem.c index f0aa7ae..1799682 100644 --- a/sys/dev/firewire/fwmem.c +++ b/sys/dev/firewire/fwmem.c @@ -445,7 +445,8 @@ int #if defined(__DragonFly__) || __FreeBSD_version < 500102 fwmem_mmap (struct cdev *dev, vm_offset_t offset, int nproto) #else -fwmem_mmap (struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nproto) +fwmem_mmap (struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nproto, vm_memattr_t *memattr) #endif { return EINVAL; diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c index c227f77..bd1173e 100644 --- a/sys/dev/hifn/hifn7751.c +++ b/sys/dev/hifn/hifn7751.c @@ -2929,8 +2929,8 @@ hifn_write_reg_1(struct hifn_softc *sc, bus_size_t reg, u_int32_t val) * */ static int -vulcanpk_mmap(struct cdev *dev, vm_offset_t offset, - vm_paddr_t *paddr, int nprot) +vulcanpk_mmap(struct cdev *dev, vm_ooffset_t offset, + vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) { struct hifn_softc *sc; vm_paddr_t pd; @@ -2942,7 +2942,8 @@ vulcanpk_mmap(struct cdev *dev, vm_offset_t offset, b = rman_get_virtual(sc->sc_bar1res); #if 0 - printf("vpk mmap: %p(%08x) offset=%d\n", b, pd, offset); + printf("vpk mmap: %p(%016llx) offset=%lld\n", b, + (unsigned long long)pd, offset); hexdump(b, HIFN_1_PUB_MEMEND, "vpk", 0); #endif diff --git a/sys/dev/ksyms/ksyms.c b/sys/dev/ksyms/ksyms.c index bca6448..3a1adca 100644 --- a/sys/dev/ksyms/ksyms.c +++ b/sys/dev/ksyms/ksyms.c @@ -589,8 +589,8 @@ ksyms_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int32_t flag __unused, /* ARGUSED */ static int -ksyms_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, - int prot __unused) +ksyms_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot __unused, vm_memattr_t *memattr __unused) { struct ksyms_softc *sc; int error; diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 66faef1..c78b190 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -2179,7 +2179,8 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) } static int -dsp_mmap(struct cdev *i_dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +dsp_mmap(struct cdev *i_dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr) { struct snddev_info *d; struct pcm_channel *wrch, *rdch, *c; diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 99d4246..f50d686 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3431,14 +3431,15 @@ next_code: } static int -sctty_mmap(struct tty *tp, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +sctty_mmap(struct tty *tp, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr) { scr_stat *scp; scp = sc_get_stat(tp); if (scp != scp->sc->cur_scp) return -1; - return vidd_mmap(scp->sc->adp, offset, paddr, nprot); + return vidd_mmap(scp->sc->adp, offset, paddr, nprot, memattr); } static int diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index 08db085..7ed00ac 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -421,7 +421,8 @@ tdfx_close(struct cdev *dev, int fflag, int devtype, struct thread *td) } static int -tdfx_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr) { /* * mmap(2) is called by a user process to request that an area of memory |