Module Name: src
Committed By: dyoung
Date: Sat Jul 9 17:22:08 UTC 2011
Modified Files:
src/sys/arch/algor/include: bus_defs.h bus_funcs.h
Log Message:
Use the definitions in mips/bus_{dma,space}_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/algor/include/bus_defs.h \
src/sys/arch/algor/include/bus_funcs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/algor/include/bus_defs.h
diff -u src/sys/arch/algor/include/bus_defs.h:1.1 src/sys/arch/algor/include/bus_defs.h:1.2
--- src/sys/arch/algor/include/bus_defs.h:1.1 Fri Jul 1 17:09:58 2011
+++ src/sys/arch/algor/include/bus_defs.h Sat Jul 9 17:22:08 2011
@@ -1,392 +1,10 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
-
-/*-
- * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or [email protected]
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
+/* $NetBSD: bus_defs.h,v 1.2 2011/07/09 17:22:08 dyoung Exp $ */
#ifndef _ALGOR_BUS_DEFS_H_
#define _ALGOR_BUS_DEFS_H_
+#define _MIPS_NEED_BUS_DMA_BOUNCE
-#include <sys/types.h>
-
-#ifdef _KERNEL
-/*
- * Addresses (in bus space).
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-/*
- * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled.
- */
-#if defined(DEBUG) && !defined(BUS_SPACE_DEBUG)
-#define BUS_SPACE_DEBUG
-#endif
-
-#ifdef BUS_SPACE_DEBUG
-#include <sys/systm.h> /* for printf() prototype */
-/*
- * Macros for checking the aligned-ness of pointers passed to bus
- * space ops. Strict alignment is required by the MIPS architecture,
- * and a trap will occur if unaligned access is performed. These
- * may aid in the debugging of a broken device driver by displaying
- * useful information about the problem.
- */
-#define __BUS_SPACE_ALIGNED_ADDRESS(p, t) \
- ((((u_long)(p)) & (sizeof(t)-1)) == 0)
-
-#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) \
-({ \
- if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \
- printf("%s 0x%lx not aligned to %zu bytes %s:%d\n", \
- d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \
- } \
- (void) 0; \
-})
-
-#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t)
-#else
-#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0
-#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
-#endif /* BUS_SPACE_DEBUG */
-#endif /* _KERNEL */
-
-struct mips_bus_space_translation;
-
-/*
- * Access methods for bus space.
- */
-typedef struct algor_bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
-
-struct algor_bus_space {
- /* cookie */
- void *bs_cookie;
-
- /* mapping/unmapping */
- int (*bs_map)(void *, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *, int);
- void (*bs_unmap)(void *, bus_space_handle_t,
- bus_size_t, int);
- int (*bs_subregion)(void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *);
-
- /* ALGOR SPECIFIC MAPPING METHOD */
- int (*bs_translate)(void *, bus_addr_t, bus_size_t,
- int, struct mips_bus_space_translation *);
- int (*bs_get_window)(void *, int,
- struct mips_bus_space_translation *);
-
- /* allocation/deallocation */
- int (*bs_alloc)(void *, bus_addr_t, bus_addr_t,
- bus_size_t, bus_size_t, bus_size_t, int,
- bus_addr_t *, bus_space_handle_t *);
- void (*bs_free)(void *, bus_space_handle_t,
- bus_size_t);
-
- /* get kernel virtual address */
- void * (*bs_vaddr)(void *, bus_space_handle_t);
-
- /* mmap for user */
- paddr_t (*bs_mmap)(void *, bus_addr_t, off_t, int, int);
-
- /* barrier */
- void (*bs_barrier)(void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int);
-
- /* read (single) */
- u_int8_t (*bs_r_1)(void *, bus_space_handle_t,
- bus_size_t);
- u_int16_t (*bs_r_2)(void *, bus_space_handle_t,
- bus_size_t);
- u_int32_t (*bs_r_4)(void *, bus_space_handle_t,
- bus_size_t);
- u_int64_t (*bs_r_8)(void *, bus_space_handle_t,
- bus_size_t);
-
- /* read multiple */
- void (*bs_rm_1)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t);
- void (*bs_rm_2)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t);
- void (*bs_rm_4)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t);
- void (*bs_rm_8)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t);
-
- /* read region */
- void (*bs_rr_1)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t);
- void (*bs_rr_2)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t);
- void (*bs_rr_4)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t);
- void (*bs_rr_8)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t);
-
- /* write (single) */
- void (*bs_w_1)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t);
- void (*bs_w_2)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t);
- void (*bs_w_4)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t);
- void (*bs_w_8)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t);
-
- /* write multiple */
- void (*bs_wm_1)(void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t);
- void (*bs_wm_2)(void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t);
- void (*bs_wm_4)(void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t);
- void (*bs_wm_8)(void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t);
-
- /* write region */
- void (*bs_wr_1)(void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t);
- void (*bs_wr_2)(void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t);
- void (*bs_wr_4)(void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t);
- void (*bs_wr_8)(void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t);
-
- /* set multiple */
- void (*bs_sm_1)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t);
- void (*bs_sm_2)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t);
- void (*bs_sm_4)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t);
- void (*bs_sm_8)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t);
-
- /* set region */
- void (*bs_sr_1)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t);
- void (*bs_sr_2)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t);
- void (*bs_sr_4)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t);
- void (*bs_sr_8)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t);
-
- /* copy */
- void (*bs_c_1)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
- void (*bs_c_2)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
- void (*bs_c_4)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
- void (*bs_c_8)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
-};
-
-/*
- * Translation of an MIPS bus address; INTERNAL USE ONLY.
- */
-struct mips_bus_space_translation {
- bus_addr_t mbst_bus_start; /* start of bus window */
- bus_addr_t mbst_bus_end; /* end of bus window */
- paddr_t mbst_sys_start; /* start of sysBus window */
- paddr_t mbst_sys_end; /* end of sysBus window */
- int mbst_align_stride;/* alignment stride */
- int mbst_flags; /* flags; see below */
-};
-
-#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
-#define BUS_SPACE_MAP_PREFETCHABLE 0x04
-
-#ifdef _KERNEL
-
-#define BUS_SPACE_BARRIER_READ 0x01
-#define BUS_SPACE_BARRIER_WRITE 0x02
-
-#define __BUS_SPACE_HAS_STREAM_METHODS 1
-
-/*
- * Flags used in various bus DMA methods.
- */
-#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */
-#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */
-#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */
-#define BUS_DMA_COHERENT 0x004 /* hint: map memory DMA coherent */
-#define BUS_DMA_STREAMING 0x008 /* hint: sequential, unidirectional */
-#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
-#define BUS_DMA_BUS2 0x020
-#define BUS_DMA_BUS3 0x040
-#define BUS_DMA_BUS4 0x080
-#define BUS_DMA_READ 0x100 /* mapping is device -> memory only */
-#define BUS_DMA_WRITE 0x200 /* mapping is memory -> device only */
-#define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */
-
-/*
- * Private flags stored in the DMA map.
- */
-#define ALGOR_DMAMAP_COHERENT 0x10000 /* no cache flush necessary on sync */
-
-/* Forwards needed by prototypes below. */
-struct mbuf;
-struct uio;
-
-/*
- * Operations performed by bus_dmamap_sync().
- */
-#define BUS_DMASYNC_PREREAD 0x01 /* pre-read synchronization */
-#define BUS_DMASYNC_POSTREAD 0x02 /* post-read synchronization */
-#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */
-#define BUS_DMASYNC_POSTWRITE 0x08 /* post-write synchronization */
-
-typedef struct algor_bus_dma_tag *bus_dma_tag_t;
-typedef struct algor_bus_dmamap *bus_dmamap_t;
-
-#define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0)
-
-/*
- * bus_dma_segment_t
- *
- * Describes a single contiguous DMA transaction. Values
- * are suitable for programming into DMA registers.
- */
-struct algor_bus_dma_segment {
- bus_addr_t ds_addr; /* DMA address */
- bus_size_t ds_len; /* length of transfer */
- bus_addr_t _ds_vaddr; /* virtual address, 0 if invalid */
-};
-typedef struct algor_bus_dma_segment bus_dma_segment_t;
-
-/*
- * bus_dma_tag_t
- *
- * A machine-dependent opaque type describing the implementation of
- * DMA for a given bus.
- */
-struct algor_bus_dma_tag {
- void *_cookie; /* cookie used in the guts */
-
- bus_addr_t _wbase; /* DMA window base */
- bus_addr_t _physbase; /* physical base of the window */
- bus_size_t _wsize; /* size of the window */
-
- /*
- * DMA mapping methods.
- */
- int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *);
- void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
- int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
- int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
- int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
- int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
- void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
- void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int);
-
- /*
- * DMA memory utility functions.
- */
- int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int);
- void (*_dmamem_free)(bus_dma_tag_t,
- bus_dma_segment_t *, int);
- int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int);
- void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
- paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int);
-};
-
-/*
- * bus_dmamap_t
- *
- * Describes a DMA mapping.
- */
-struct algor_bus_dmamap {
- /*
- * PRIVATE MEMBERS: not for use my machine-independent code.
- */
- bus_size_t _dm_size; /* largest DMA transfer mappable */
- int _dm_segcnt; /* number of segs this map can map */
- bus_size_t _dm_maxmaxsegsz; /* fixed largest possible segment */
- bus_size_t _dm_boundary; /* don't cross this */
- int _dm_flags; /* misc. flags */
- struct vmspace *_dm_vmspace; /* vmspace that owns the mapping */
-
- /*
- * Private cookie to be used by the DMA back-end.
- */
- void *_dm_cookie;
-
- /*
- * PUBLIC MEMBERS: these are used by machine-independent code.
- */
- bus_size_t dm_maxsegsz; /* largest possible segment */
- bus_size_t dm_mapsize; /* size of the mapping */
- int dm_nsegs; /* # valid segments in mapping */
- bus_dma_segment_t dm_segs[1]; /* segments; variable length */
-};
-
-#endif /* _KERNEL */
+#include <mips/bus_space_defs.h>
+#include <mips/bus_dma_defs.h>
#endif /* _ALGOR_BUS_DEFS_H_ */
Index: src/sys/arch/algor/include/bus_funcs.h
diff -u src/sys/arch/algor/include/bus_funcs.h:1.1 src/sys/arch/algor/include/bus_funcs.h:1.2
--- src/sys/arch/algor/include/bus_funcs.h:1.1 Fri Jul 1 17:09:58 2011
+++ src/sys/arch/algor/include/bus_funcs.h Sat Jul 9 17:22:08 2011
@@ -1,363 +1,9 @@
-/* $NetBSD: bus_funcs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
-
-/*-
- * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or [email protected]
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
+/* $NetBSD: bus_funcs.h,v 1.2 2011/07/09 17:22:08 dyoung Exp $ */
#ifndef _ALGOR_BUS_FUNCS_H_
#define _ALGOR_BUS_FUNCS_H_
-#ifdef _KERNEL
-/*
- * Access methods for bus space.
- */
-
-/*
- * Utility macros; INTERNAL USE ONLY.
- */
-#define __bs_c(a,b) __CONCAT(a,b)
-#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size)
-
-#define __bs_rs(sz, tn, t, h, o) \
- (__BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"), \
- (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o))
-
-#define __bs_ws(sz, tn, t, h, o, v) \
-do { \
- __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
- (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v); \
-} while (0)
-
-#define __bs_nonsingle(type, sz, tn, t, h, o, a, c) \
-do { \
- __BUS_SPACE_ADDRESS_SANITY((a), tn, "buffer"); \
- __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
- (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c); \
-} while (0)
-
-#define __bs_set(type, sz, tn, t, h, o, v, c) \
-do { \
- __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
- (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, v, c); \
-} while (0)
-
-#define __bs_copy(sz, tn, t, h1, o1, h2, o2, cnt) \
-do { \
- __BUS_SPACE_ADDRESS_SANITY((h1) + (o1), tn, "bus addr 1"); \
- __BUS_SPACE_ADDRESS_SANITY((h2) + (o2), tn, "bus addr 2"); \
- (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt); \
-} while (0)
-
-
-/*
- * Mapping and unmapping operations.
- */
-#define bus_space_map(t, a, s, f, hp) \
- (*(t)->bs_map)((t)->bs_cookie, (a), (s), (f), (hp), 1)
-#define algor_bus_space_map_noacct(t, a, s, f, hp) \
- (*(t)->bs_map)((t)->bs_cookie, (a), (s), (f), (hp), 0)
-#define bus_space_unmap(t, h, s) \
- (*(t)->bs_unmap)((t)->bs_cookie, (h), (s), 1)
-#define algor_bus_space_unmap_noacct(t, h, s) \
- (*(t)->bs_unmap)((t)->bs_cookie, (h), (s), 0)
-#define bus_space_subregion(t, h, o, s, hp) \
- (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp))
-
-#define algor_bus_space_translate(t, a, s, f, bst) \
- (*(t)->bs_translate)((t)->bs_cookie, (a), (s), (f), (bst))
-#define algor_bus_space_get_window(t, w, bst) \
- (*(t)->bs_get_window)((t)->bs_cookie, (w), (bst))
-
-/*
- * Allocation and deallocation operations.
- */
-#define bus_space_alloc(t, rs, re, s, a, b, f, ap, hp) \
- (*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b), \
- (f), (ap), (hp))
-#define bus_space_free(t, h, s) \
- (*(t)->bs_free)((t)->bs_cookie, (h), (s))
-
-/*
- * Get kernel virtual address for ranges mapped BUS_SPACE_MAP_LINEAR.
- */
-#define bus_space_vaddr(t, h) \
- (*(t)->bs_vaddr)((t)->bs_cookie, (h))
-
-/*
- * Mmap for user.
- */
-#define bus_space_mmap(t, a, o, p, f) \
- (*(t)->bs_mmap)((t)->bs_cookie, (a), (o), (p), (f))
-
-/*
- * Bus barrier operations.
- */
-#define bus_space_barrier(t, h, o, l, f) \
- (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f))
-
-/*
- * Bus read (single) operations.
- */
-#define bus_space_read_1(t, h, o) __bs_rs(1,u_int8_t,(t),(h),(o))
-#define bus_space_read_2(t, h, o) __bs_rs(2,u_int16_t,(t),(h),(o))
-#define bus_space_read_4(t, h, o) __bs_rs(4,u_int32_t,(t),(h),(o))
-#define bus_space_read_8(t, h, o) __bs_rs(8,u_int64_t,(t),(h),(o))
-
-
-/*
- * Bus read multiple operations.
- */
-#define bus_space_read_multi_1(t, h, o, a, c) \
- __bs_nonsingle(rm,1,u_int8_t,(t),(h),(o),(a),(c))
-#define bus_space_read_multi_2(t, h, o, a, c) \
- __bs_nonsingle(rm,2,u_int16_t,(t),(h),(o),(a),(c))
-#define bus_space_read_multi_4(t, h, o, a, c) \
- __bs_nonsingle(rm,4,u_int32_t,(t),(h),(o),(a),(c))
-#define bus_space_read_multi_8(t, h, o, a, c) \
- __bs_nonsingle(rm,8,u_int64_t,(t),(h),(o),(a),(c))
-
-
-/*
- * Bus read region operations.
- */
-#define bus_space_read_region_1(t, h, o, a, c) \
- __bs_nonsingle(rr,1,u_int8_t,(t),(h),(o),(a),(c))
-#define bus_space_read_region_2(t, h, o, a, c) \
- __bs_nonsingle(rr,2,u_int16_t,(t),(h),(o),(a),(c))
-#define bus_space_read_region_4(t, h, o, a, c) \
- __bs_nonsingle(rr,4,u_int32_t,(t),(h),(o),(a),(c))
-#define bus_space_read_region_8(t, h, o, a, c) \
- __bs_nonsingle(rr,8,u_int64_t,(t),(h),(o),(a),(c))
-
-
-/*
- * Bus write (single) operations.
- */
-#define bus_space_write_1(t, h, o, v) __bs_ws(1,u_int8_t,(t),(h),(o),(v))
-#define bus_space_write_2(t, h, o, v) __bs_ws(2,u_int16_t,(t),(h),(o),(v))
-#define bus_space_write_4(t, h, o, v) __bs_ws(4,u_int32_t,(t),(h),(o),(v))
-#define bus_space_write_8(t, h, o, v) __bs_ws(8,u_int64_t,(t),(h),(o),(v))
-
-
-/*
- * Bus write multiple operations.
- */
-#define bus_space_write_multi_1(t, h, o, a, c) \
- __bs_nonsingle(wm,1,u_int8_t,(t),(h),(o),(a),(c))
-#define bus_space_write_multi_2(t, h, o, a, c) \
- __bs_nonsingle(wm,2,u_int16_t,(t),(h),(o),(a),(c))
-#define bus_space_write_multi_4(t, h, o, a, c) \
- __bs_nonsingle(wm,4,u_int32_t,(t),(h),(o),(a),(c))
-#define bus_space_write_multi_8(t, h, o, a, c) \
- __bs_nonsingle(wm,8,u_int64_t,(t),(h),(o),(a),(c))
-
-
-/*
- * Bus write region operations.
- */
-#define bus_space_write_region_1(t, h, o, a, c) \
- __bs_nonsingle(wr,1,u_int8_t,(t),(h),(o),(a),(c))
-#define bus_space_write_region_2(t, h, o, a, c) \
- __bs_nonsingle(wr,2,u_int16_t,(t),(h),(o),(a),(c))
-#define bus_space_write_region_4(t, h, o, a, c) \
- __bs_nonsingle(wr,4,u_int32_t,(t),(h),(o),(a),(c))
-#define bus_space_write_region_8(t, h, o, a, c) \
- __bs_nonsingle(wr,8,u_int64_t,(t),(h),(o),(a),(c))
-
-
-/*
- * Set multiple operations.
- */
-#define bus_space_set_multi_1(t, h, o, v, c) \
- __bs_set(sm,1,u_int8_t,(t),(h),(o),(v),(c))
-#define bus_space_set_multi_2(t, h, o, v, c) \
- __bs_set(sm,2,u_int16_t,(t),(h),(o),(v),(c))
-#define bus_space_set_multi_4(t, h, o, v, c) \
- __bs_set(sm,4,u_int32_t,(t),(h),(o),(v),(c))
-#define bus_space_set_multi_8(t, h, o, v, c) \
- __bs_set(sm,8,u_int64_t,(t),(h),(o),(v),(c))
-
-
-/*
- * Set region operations.
- */
-#define bus_space_set_region_1(t, h, o, v, c) \
- __bs_set(sr,1,u_int8_t,(t),(h),(o),(v),(c))
-#define bus_space_set_region_2(t, h, o, v, c) \
- __bs_set(sr,2,u_int16_t,(t),(h),(o),(v),(c))
-#define bus_space_set_region_4(t, h, o, v, c) \
- __bs_set(sr,4,u_int32_t,(t),(h),(o),(v),(c))
-#define bus_space_set_region_8(t, h, o, v, c) \
- __bs_set(sr,8,u_int64_t,(t),(h),(o),(v),(c))
-
-
-/*
- * Copy region operations.
- */
-#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \
- __bs_copy(1, u_int8_t, (t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \
- __bs_copy(2, u_int16_t, (t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \
- __bs_copy(4, u_int32_t, (t), (h1), (o1), (h2), (o2), (c))
-#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \
- __bs_copy(8, u_int64_t, (t), (h1), (o1), (h2), (o2), (c))
-
-/*
- * Bus stream operations--defined in terms of non-stream counterparts
- */
-#define bus_space_read_stream_1 bus_space_read_1
-#define bus_space_read_stream_2 bus_space_read_2
-#define bus_space_read_stream_4 bus_space_read_4
-#define bus_space_read_stream_8 bus_space_read_8
-#define bus_space_read_multi_stream_1 bus_space_read_multi_1
-#define bus_space_read_multi_stream_2 bus_space_read_multi_2
-#define bus_space_read_multi_stream_4 bus_space_read_multi_4
-#define bus_space_read_multi_stream_8 bus_space_read_multi_8
-#define bus_space_read_region_stream_1 bus_space_read_region_1
-#define bus_space_read_region_stream_2 bus_space_read_region_2
-#define bus_space_read_region_stream_4 bus_space_read_region_4
-#define bus_space_read_region_stream_8 bus_space_read_region_8
-#define bus_space_write_stream_1 bus_space_write_1
-#define bus_space_write_stream_2 bus_space_write_2
-#define bus_space_write_stream_4 bus_space_write_4
-#define bus_space_write_stream_8 bus_space_write_8
-#define bus_space_write_multi_stream_1 bus_space_write_multi_1
-#define bus_space_write_multi_stream_2 bus_space_write_multi_2
-#define bus_space_write_multi_stream_4 bus_space_write_multi_4
-#define bus_space_write_multi_stream_8 bus_space_write_multi_8
-#define bus_space_write_region_stream_1 bus_space_write_region_1
-#define bus_space_write_region_stream_2 bus_space_write_region_2
-#define bus_space_write_region_stream_4 bus_space_write_region_4
-#define bus_space_write_region_stream_8 bus_space_write_region_8
-
-
-/*
- * Bus DMA methods.
- */
-
-/* Forwards needed by prototypes below. */
-struct mbuf;
-struct uio;
-
-#define bus_dmamap_create(t, s, n, m, b, f, p) \
- (*(t)->_dmamap_create)((t), (s), (n), (m), (b), (f), (p))
-#define bus_dmamap_destroy(t, p) \
- (*(t)->_dmamap_destroy)((t), (p))
-#define bus_dmamap_load(t, m, b, s, p, f) \
- (*(t)->_dmamap_load)((t), (m), (b), (s), (p), (f))
-#define bus_dmamap_load_mbuf(t, m, b, f) \
- (*(t)->_dmamap_load_mbuf)((t), (m), (b), (f))
-#define bus_dmamap_load_uio(t, m, u, f) \
- (*(t)->_dmamap_load_uio)((t), (m), (u), (f))
-#define bus_dmamap_load_raw(t, m, sg, n, s, f) \
- (*(t)->_dmamap_load_raw)((t), (m), (sg), (n), (s), (f))
-#define bus_dmamap_unload(t, p) \
- (*(t)->_dmamap_unload)((t), (p))
-#define bus_dmamap_sync(t, p, o, l, ops) \
- (*(t)->_dmamap_sync)((t), (p), (o), (l), (ops))
-#define bus_dmamem_alloc(t, s, a, b, sg, n, r, f) \
- (*(t)->_dmamem_alloc)((t), (s), (a), (b), (sg), (n), (r), (f))
-#define bus_dmamem_free(t, sg, n) \
- (*(t)->_dmamem_free)((t), (sg), (n))
-#define bus_dmamem_map(t, sg, n, s, k, f) \
- (*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f))
-#define bus_dmamem_unmap(t, k, s) \
- (*(t)->_dmamem_unmap)((t), (k), (s))
-#define bus_dmamem_mmap(t, sg, n, o, p, f) \
- (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f))
-
-#define bus_dmatag_subregion(t, mna, mxa, nt, f) EOPNOTSUPP
-#define bus_dmatag_destroy(t)
-
-#ifdef _ALGOR_BUS_DMA_PRIVATE
-int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *);
-void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
-
-int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t,
- void *, bus_size_t, struct proc *, int);
-int _bus_dmamap_load_mbuf(bus_dma_tag_t,
- bus_dmamap_t, struct mbuf *, int);
-int _bus_dmamap_load_uio(bus_dma_tag_t,
- bus_dmamap_t, struct uio *, int);
-int _bus_dmamap_load_raw(bus_dma_tag_t,
- bus_dmamap_t, bus_dma_segment_t *, int, bus_size_t, int);
-
-void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
-void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int);
-
-int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
- bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
-int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
- bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- paddr_t low, paddr_t high);
-void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs);
-int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, void **kvap, int flags);
-void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva,
- size_t size);
-paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags);
-#endif /* _ALGOR_BUS_DMA_PRIVATE */
-
-#endif /* _KERNEL */
+#include <mips/bus_space_funcs.h>
+#include <mips/bus_dma_funcs.h>
#endif /* _ALGOR_BUS_FUNCS_H_ */
