Deleted Added
full compact
bus.h (129198) bus.h (130585)
1/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */
2
3/*-
4 * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

--- 53 unchanged lines hidden (view full) ---

62 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
63 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
64 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
65 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
66 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
67 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
68 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
69 *
1/* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */
2
3/*-
4 * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
5 * All rights reserved.
6 *
7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,

--- 53 unchanged lines hidden (view full) ---

62 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
63 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
64 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
65 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
66 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
67 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
68 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
69 *
70 * $FreeBSD: head/sys/arm/include/bus.h 129198 2004-05-14 11:46:45Z cognet $
70 * $FreeBSD: head/sys/arm/include/bus.h 130585 2004-06-16 09:47:26Z phk $
71 */
72
73#ifndef _MACHINE_BUS_H_
74#define _MACHINE_BUS_H_
75
76/*
77 * Addresses (in bus space).
78 */

--- 34 unchanged lines hidden (view full) ---

113 bus_addr_t *, bus_space_handle_t *);
114 void (*bs_free) (void *, bus_space_handle_t,
115 bus_size_t);
116
117 /* get kernel virtual address */
118 void * (*bs_vaddr) (void *, bus_space_handle_t);
119
120 /* mmap bus space for user */
71 */
72
73#ifndef _MACHINE_BUS_H_
74#define _MACHINE_BUS_H_
75
76/*
77 * Addresses (in bus space).
78 */

--- 34 unchanged lines hidden (view full) ---

113 bus_addr_t *, bus_space_handle_t *);
114 void (*bs_free) (void *, bus_space_handle_t,
115 bus_size_t);
116
117 /* get kernel virtual address */
118 void * (*bs_vaddr) (void *, bus_space_handle_t);
119
120 /* mmap bus space for user */
121 int (*bs_mmap) (dev_t, vm_offset_t, vm_paddr_t *, int);
121 int (*bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int);
122
123 /* barrier */
124 void (*bs_barrier) (void *, bus_space_handle_t,
125 bus_size_t, bus_size_t, int);
126
127 /* read (single) */
128 u_int8_t (*bs_r_1) (void *, bus_space_handle_t, bus_size_t);
129 u_int16_t (*bs_r_2) (void *, bus_space_handle_t, bus_size_t);

--- 276 unchanged lines hidden (view full) ---

406#define bs_free_proto(f) \
407void __bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh, \
408 bus_size_t size);
409
410#define bs_vaddr_proto(f) \
411void * __bs_c(f,_bs_vaddr) (void *t, bus_space_handle_t bsh);
412
413#define bs_mmap_proto(f) \
122
123 /* barrier */
124 void (*bs_barrier) (void *, bus_space_handle_t,
125 bus_size_t, bus_size_t, int);
126
127 /* read (single) */
128 u_int8_t (*bs_r_1) (void *, bus_space_handle_t, bus_size_t);
129 u_int16_t (*bs_r_2) (void *, bus_space_handle_t, bus_size_t);

--- 276 unchanged lines hidden (view full) ---

406#define bs_free_proto(f) \
407void __bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh, \
408 bus_size_t size);
409
410#define bs_vaddr_proto(f) \
411void * __bs_c(f,_bs_vaddr) (void *t, bus_space_handle_t bsh);
412
413#define bs_mmap_proto(f) \
414int __bs_c(f,_bs_mmap) (dev_t, vm_offset_t, vm_paddr_t *, int);
414int __bs_c(f,_bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int);
415
416#define bs_barrier_proto(f) \
417void __bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh, \
418 bus_size_t offset, bus_size_t len, int flags);
419
420#define bs_r_1_proto(f) \
421u_int8_t __bs_c(f,_bs_r_1) (void *t, bus_space_handle_t bsh, \
422 bus_size_t offset);

--- 347 unchanged lines hidden ---
415
416#define bs_barrier_proto(f) \
417void __bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh, \
418 bus_size_t offset, bus_size_t len, int flags);
419
420#define bs_r_1_proto(f) \
421u_int8_t __bs_c(f,_bs_r_1) (void *t, bus_space_handle_t bsh, \
422 bus_size_t offset);

--- 347 unchanged lines hidden ---