Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch On ARM-ish ports having PCI support, use new-style ...
details: https://anonhg.NetBSD.org/src/rev/b444c51dae78
branches: trunk
changeset: 767399:b444c51dae78
user: dyoung <dyoung%NetBSD.org@localhost>
date: Sun Jul 17 23:46:49 2011 +0000
description:
On ARM-ish ports having PCI support, use new-style <sys/bus.h>. Do not
install <machine/bus.h>. Remove various <machine/bus.h> sources.
diffstat:
sys/arch/arm/include/bus.h | 976 -------------------------------------
sys/arch/arm/include/types.h | 3 +-
sys/arch/cats/include/Makefile | 4 +-
sys/arch/cats/include/bus.h | 3 -
sys/arch/cats/include/types.h | 4 +-
sys/arch/evbarm/include/Makefile | 4 +-
sys/arch/evbarm/include/bus.h | 3 -
sys/arch/evbarm/include/types.h | 4 +-
sys/arch/iyonix/include/Makefile | 4 +-
sys/arch/iyonix/include/bus.h | 3 -
sys/arch/iyonix/include/types.h | 4 +-
sys/arch/netwinder/include/bus.h | 3 -
sys/arch/netwinder/include/types.h | 4 +-
13 files changed, 16 insertions(+), 1003 deletions(-)
diffs (truncated from 1134 to 300 lines):
diff -r 7f65e3919011 -r b444c51dae78 sys/arch/arm/include/bus.h
--- a/sys/arch/arm/include/bus.h Sun Jul 17 23:40:43 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,976 +0,0 @@
-/* $NetBSD: bus.h,v 1.20 2009/03/14 14:45:55 dsl Exp $ */
-
-/*-
- * Copyright (c) 1996, 1997, 1998, 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 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 _ARM32_BUS_H_
-#define _ARM32_BUS_H_
-
-#if defined(_KERNEL_OPT)
-#include "opt_arm_bus_space.h"
-#endif
-
-/*
- * Addresses (in bus space).
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-/*
- * Access methods for bus space.
- */
-typedef struct bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
-
-/*
- * int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp);
- *
- * Map a region of bus space.
- */
-
-#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
-#define BUS_SPACE_MAP_PREFETCHABLE 0x04
-
-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);
-
- /* 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);
-
-#ifdef __BUS_SPACE_HAS_STREAM_METHODS
- /* read stream (single) */
- u_int8_t (*bs_r_1_s)(void *, bus_space_handle_t,
- bus_size_t);
- u_int16_t (*bs_r_2_s)(void *, bus_space_handle_t,
- bus_size_t);
- u_int32_t (*bs_r_4_s)(void *, bus_space_handle_t,
- bus_size_t);
- u_int64_t (*bs_r_8_s)(void *, bus_space_handle_t,
- bus_size_t);
-
- /* read multiple stream */
- void (*bs_rm_1_s)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t);
- void (*bs_rm_2_s)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t);
- void (*bs_rm_4_s)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t);
- void (*bs_rm_8_s)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t);
-
- /* read region stream */
- void (*bs_rr_1_s)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t);
- void (*bs_rr_2_s)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t);
- void (*bs_rr_4_s)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t);
- void (*bs_rr_8_s)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t);
-
- /* write stream (single) */
- void (*bs_w_1_s)(void *, bus_space_handle_t,
- bus_size_t, u_int8_t);
- void (*bs_w_2_s)(void *, bus_space_handle_t,
- bus_size_t, u_int16_t);
- void (*bs_w_4_s)(void *, bus_space_handle_t,
- bus_size_t, u_int32_t);
- void (*bs_w_8_s)(void *, bus_space_handle_t,
- bus_size_t, u_int64_t);
-
- /* write multiple stream */
- void (*bs_wm_1_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t);
- void (*bs_wm_2_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t);
- void (*bs_wm_4_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t);
- void (*bs_wm_8_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t);
-
- /* write region stream */
- void (*bs_wr_1_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t);
- void (*bs_wr_2_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t);
- void (*bs_wr_4_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t);
- void (*bs_wr_8_s)(void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t);
-#endif /* __BUS_SPACE_HAS_STREAM_METHODS */
-};
-
-
-/*
- * 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, t, h, o) \
- (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o)
-#define __bs_ws(sz, t, h, o, v) \
- (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v)
-#define __bs_nonsingle(type, sz, t, h, o, a, c) \
- (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c)
-#define __bs_set(type, sz, t, h, o, v, c) \
- (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, v, c)
-#define __bs_copy(sz, t, h1, o1, h2, o2, cnt) \
- (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt)
-
-#ifdef __BUS_SPACE_HAS_STREAM_METHODS
-#define __bs_opname_s(op,size) __bs_c(__bs_c(__bs_c(__bs_c(bs_,op),_),size),_s)
-#define __bs_rs_s(sz, t, h, o) \
Home |
Main Index |
Thread Index |
Old Index