Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/atari/include Switch to new-style <sys/bus.h>.
details: https://anonhg.NetBSD.org/src/rev/fa987d884aaa
branches: trunk
changeset: 767397:fa987d884aaa
user: dyoung <dyoung%NetBSD.org@localhost>
date: Sun Jul 17 23:40:16 2011 +0000
description:
Switch to new-style <sys/bus.h>.
diffstat:
sys/arch/atari/include/bus.h | 702 -----------------------------------------
sys/arch/atari/include/types.h | 4 +-
2 files changed, 2 insertions(+), 704 deletions(-)
diffs (truncated from 722 to 300 lines):
diff -r d2f1946f0d1f -r fa987d884aaa sys/arch/atari/include/bus.h
--- a/sys/arch/atari/include/bus.h Sun Jul 17 23:39:46 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,702 +0,0 @@
-/* $NetBSD: bus.h,v 1.39 2009/03/08 05:25:31 tsutsui Exp $ */
-
-/*-
- * Copyright (c) 1998 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 Software.Distribution%CS.CMU.EDU@localhost
- * 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.
- */
-
-#ifndef _ATARI_BUS_H_
-#define _ATARI_BUS_H_
-
-/*
- * I/O addresses (in bus space)
- */
-typedef u_long bus_io_addr_t;
-typedef u_long bus_io_size_t;
-
-/*
- * Memory addresses (in bus space)
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-#define __BUS_SPACE_HAS_STREAM_METHODS
-
-/*
- * Access methods for bus resources and address space.
- */
-typedef struct atari_bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
-
-#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
-#define BUS_SPACE_MAP_PREFETCHABLE 0x04
-
-int bus_space_alloc(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t,
- bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
-int bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *);
-void bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
-int bus_space_subregion(bus_space_tag_t, bus_space_handle_t, bus_size_t,
- bus_size_t, bus_space_handle_t *);
-
-/*
- * Tag allocation
- */
-bus_space_tag_t beb_alloc_bus_space_tag(bus_space_tag_t);
-bus_space_tag_t leb_alloc_bus_space_tag(bus_space_tag_t);
-
-/*
- * XXX
- */
-bus_space_tag_t mb_alloc_bus_space_tag(void);
-void mb_free_bus_space_tag(bus_space_tag_t);
-
-/*
- * Structure containing functions and other feature-data that might differ
- * between the various bus spaces on the atari. Currently 'known' bus
- * spaces are: ISA, PCI, VME and 'mainbus'.
- */
-struct atari_bus_space {
- u_long base;
-
- /* XXX Next 2 lines can be turned into an opaque cookie */
- int stride;
- int wo_1, wo_2, wo_4, wo_8;
-
- /* Autoconf detection stuff */
- int (*abs_p_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- int (*abs_p_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- int (*abs_p_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- int (*abs_p_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
-
- /* read (single) */
- uint8_t (*abs_r_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- uint16_t (*abs_r_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- uint32_t (*abs_r_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- uint64_t (*abs_r_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
-
- /* read (single) stream */
- uint8_t (*abs_rs_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- uint16_t (*abs_rs_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- uint32_t (*abs_rs_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
- uint64_t (*abs_rs_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t);
-
- /* read multiple */
- void (*abs_rm_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*abs_rm_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*abs_rm_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*abs_rm_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* read multiple stream */
- void (*abs_rms_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*abs_rms_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*abs_rms_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*abs_rms_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* read region */
- void (*abs_rr_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*abs_rr_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*abs_rr_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*abs_rr_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* read region stream */
- void (*abs_rrs_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*abs_rrs_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*abs_rrs_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*abs_rrs_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* write (single) */
- void (*abs_w_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t);
- void (*abs_w_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t);
- void (*abs_w_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t);
- void (*abs_w_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t);
-
- /* write (single) stream */
- void (*abs_ws_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t);
- void (*abs_ws_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t);
- void (*abs_ws_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t);
- void (*abs_ws_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t);
-
- /* write multiple */
- void (*abs_wm_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*abs_wm_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*abs_wm_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*abs_wm_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* write multiple stream */
- void (*abs_wms_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*abs_wms_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*abs_wms_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*abs_wms_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* write region */
- void (*abs_wr_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*abs_wr_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*abs_wr_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*abs_wr_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* write region stream */
- void (*abs_wrs_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*abs_wrs_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*abs_wrs_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*abs_wrs_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* set multiple */
- void (*abs_sm_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t, bus_size_t);
- void (*abs_sm_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t, bus_size_t);
- void (*abs_sm_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t, bus_size_t);
- void (*abs_sm_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t, bus_size_t);
-
- /* set region */
- void (*abs_sr_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint8_t, bus_size_t);
- void (*abs_sr_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint16_t, bus_size_t);
- void (*abs_sr_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint32_t, bus_size_t);
- void (*abs_sr_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, uint64_t, bus_size_t);
-
-#if 0 /* See comment on __abs_copy below */
- /* copy */
- void (*abs_c_1)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t,
- bus_size_t);
- void (*abs_c_2)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t,
- bus_size_t);
- void (*abs_c_4)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t,
- bus_size_t);
- void (*abs_c_8)(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t,
- bus_size_t);
-#endif
-};
-
-/*
- * Utility macros; INTERNAL USE ONLY.
- */
-#define __abs_c(a,b) __CONCAT(a,b)
-#define __abs_opname(op,size) __abs_c(__abs_c(__abs_c(abs_,op),_),size)
-
-#define __abs_p(sz, t, h, o) \
- (*(t)->__abs_opname(p,sz))(t, h, o)
-#define __abs_rs(sz, t, h, o) \
- (*(t)->__abs_opname(r,sz))(t, h, o)
-#define __abs_rss(sz, t, h, o) \
Home |
Main Index |
Thread Index |
Old Index