Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Switch to new-style <sys/bus.h>.
details: https://anonhg.NetBSD.org/src/rev/b7474b6c4dac
branches: trunk
changeset: 767401:b7474b6c4dac
user: dyoung <dyoung%NetBSD.org@localhost>
date: Sun Jul 17 23:48:35 2011 +0000
description:
Switch to new-style <sys/bus.h>.
diffstat:
sys/arch/landisk/include/bus.h | 626 -----------------------------
sys/arch/landisk/include/types.h | 4 +-
sys/arch/sbmips/include/bus.h | 11 -
sys/arch/sbmips/include/types.h | 4 +-
sys/arch/sh3/include/bus.h | 830 ---------------------------------------
sys/arch/sh3/include/types.h | 3 +-
6 files changed, 7 insertions(+), 1471 deletions(-)
diffs (truncated from 1524 to 300 lines):
diff -r d09f04be539d -r b7474b6c4dac sys/arch/landisk/include/bus.h
--- a/sys/arch/landisk/include/bus.h Sun Jul 17 23:46:53 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,626 +0,0 @@
-/* $NetBSD: bus.h,v 1.5 2009/08/02 00:06:44 nonaka Exp $ */
-
-/*-
- * Copyright (c) 1996, 1997 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 Charles M. Hannum. All rights reserved.
- * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Christopher G. Demetriou
- * for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- */
-
-#ifndef _LANDISK_BUS_H_
-#define _LANDISK_BUS_H_
-
-#include <sys/types.h>
-
-#ifdef _KERNEL
-/*
- * 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 Alpha 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 %lu bytes %s:%d\n", \
- d, (u_long)(p), (u_long)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 */
-
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-typedef struct _bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
-
-struct _bus_space {
- /* cookie */
- void *bs_cookie;
-
- /* mapping/unmapping */
- int (*bs_map)(void *, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *);
- void (*bs_unmap)(void *, bus_space_handle_t,
- bus_size_t);
- int (*bs_subregion)(void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *);
-
- /* 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 bus space for user */
- paddr_t (*bs_mmap)(void *, bus_addr_t, off_t, int, int);
-
- /* read (single) */
- uint8_t (*bs_r_1)(void *, bus_space_handle_t,
- bus_size_t);
- uint16_t (*bs_r_2)(void *, bus_space_handle_t,
- bus_size_t);
- uint32_t (*bs_r_4)(void *, bus_space_handle_t,
- bus_size_t);
- uint64_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, uint8_t *, bus_size_t);
- void (*bs_rm_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*bs_rm_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*bs_rm_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* read region */
- void (*bs_rr_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*bs_rr_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*bs_rr_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*bs_rr_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* write (single) */
- void (*bs_w_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t);
- void (*bs_w_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t);
- void (*bs_w_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t);
- void (*bs_w_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t);
-
- /* write multiple */
- void (*bs_wm_1)(void *, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*bs_wm_2)(void *, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*bs_wm_4)(void *, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*bs_wm_8)(void *, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* write region */
- void (*bs_wr_1)(void *, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*bs_wr_2)(void *, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*bs_wr_4)(void *, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*bs_wr_8)(void *, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* set multiple */
- void (*bs_sm_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t, bus_size_t);
- void (*bs_sm_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t, bus_size_t);
- void (*bs_sm_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t, bus_size_t);
- void (*bs_sm_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t, bus_size_t);
-
- /* set region */
- void (*bs_sr_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t, bus_size_t);
- void (*bs_sr_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t, bus_size_t);
- void (*bs_sr_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t, bus_size_t);
- void (*bs_sr_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_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);
-};
-
-#ifdef _KERNEL
-/*
- * 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))
-#define bus_space_unmap(t, h, s) \
- (*(t)->bs_unmap)((t)->bs_cookie, (h), (s))
-#define bus_space_subregion(t, h, o, s, hp) \
- (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp))
-
-#endif /* _KERNEL */
-
-#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
-#define BUS_SPACE_MAP_PREFETCHABLE 0x04
-
-#ifdef _KERNEL
-/*
- * 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))
-
Home |
Main Index |
Thread Index |
Old Index