From 62f11850164dcaf965897837950ae558907b12c6 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Thu, 17 Jun 2004 17:51:48 +0000 Subject: [PATCH] Nuke bus_space_mmap(), as it does not exist in FreeBSD. --- sys/arm/arm/nexus_io.c | 2 -- sys/arm/include/bus.h | 9 --------- sys/arm/sa11x0/sa11x0_io.c | 10 ---------- 3 files changed, 21 deletions(-) diff --git a/sys/arm/arm/nexus_io.c b/sys/arm/arm/nexus_io.c index 969c30e95baf..b27d77965134 100644 --- a/sys/arm/arm/nexus_io.c +++ b/sys/arm/arm/nexus_io.c @@ -75,8 +75,6 @@ struct bus_space mainbus_bs_tag = { /* get kernel virtual address */ 0, /* there is no linear mapping */ - NULL, - /* barrier */ nexus_bs_barrier, diff --git a/sys/arm/include/bus.h b/sys/arm/include/bus.h index 60660506e77a..7a977001a133 100644 --- a/sys/arm/include/bus.h +++ b/sys/arm/include/bus.h @@ -117,9 +117,6 @@ struct bus_space { /* get kernel virtual address */ void * (*bs_vaddr) (void *, bus_space_handle_t); - /* mmap bus space for user */ - int (*bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int); - /* barrier */ void (*bs_barrier) (void *, bus_space_handle_t, bus_size_t, bus_size_t, int); @@ -257,12 +254,6 @@ struct bus_space { #define bus_space_vaddr(t, h) \ (*(t)->bs_vaddr)((t)->bs_cookie, (h)) -/* - * MMap bus space for a user application. - */ -#define bus_space_mmap(t, a, o, p, f) \ - (*(t)->bs_mmap)((t)->bs_cookie, (a), (o), (p), (f)) - /* * Bus barrier operations. */ diff --git a/sys/arm/sa11x0/sa11x0_io.c b/sys/arm/sa11x0/sa11x0_io.c index 0fe03751d674..09a5c937d591 100644 --- a/sys/arm/sa11x0/sa11x0_io.c +++ b/sys/arm/sa11x0/sa11x0_io.c @@ -79,9 +79,6 @@ struct bus_space sa11x0_bs_tag = { /* get kernel virtual address */ sa11x0_bs_vaddr, - /* mmap bus space for userland */ - sa11x0_bs_mmap, - /* barrier */ sa11x0_bs_barrier, @@ -224,13 +221,6 @@ sa11x0_bs_subregion(t, bsh, offset, size, nbshp) return (0); } -int -sa11x0_bs_mmap(struct cdev *t, vm_offset_t offset, vm_paddr_t *paddr, int nprot) -{ - *paddr = offset; - return (0); -} - void * sa11x0_bs_vaddr(t, bsh) void *t;