Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcsh/include Straggler from last: bus.h -> bus_{de...
details: https://anonhg.NetBSD.org/src/rev/a0ec9ac494ea
branches: trunk
changeset: 767472:a0ec9ac494ea
user: dyoung <dyoung%NetBSD.org@localhost>
date: Tue Jul 19 15:31:44 2011 +0000
description:
Straggler from last: bus.h -> bus_{defs,funcs}.h.
diffstat:
sys/arch/hpcsh/include/bus.h | 782 -------------------------------------
sys/arch/hpcsh/include/bus_defs.h | 366 +++++++++++++++++
sys/arch/hpcsh/include/bus_funcs.h | 342 ++++++++++++++++
3 files changed, 708 insertions(+), 782 deletions(-)
diffs (truncated from 1502 to 300 lines):
diff -r 12520d04481a -r a0ec9ac494ea sys/arch/hpcsh/include/bus.h
--- a/sys/arch/hpcsh/include/bus.h Tue Jul 19 15:30:51 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,782 +0,0 @@
-/* $NetBSD: bus.h,v 1.19 2010/06/28 11:18:44 kiyohara Exp $ */
-
-/*-
- * Copyright (c) 1997, 1998, 2000, 2001, 2002 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 _HPCSH_BUS_H_
-#define _HPCSH_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 */
-
-/*
- * Addresses (in bus space).
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-/*
- * Access methods for bus space.
- */
-typedef struct hpcsh_bus_space *bus_space_tag_t;
-typedef u_long bus_space_handle_t;
-
-struct extent; /* forward declaration */
-
-struct hpcsh_bus_space {
- struct extent *hbs_extent;
- bus_addr_t hbs_base_addr;
-
- /* cookie */
- void *hbs_cookie;
-
- int hbs_flags;
-#define HBS_FLAGS_ALLOCATED (1 < 0)
-
- /* mapping/unmapping */
- int (*hbs_map)(void *, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *);
- void (*hbs_unmap)(void *, bus_space_handle_t,
- bus_size_t);
- int (*hbs_subregion)(void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *);
-
- /* allocation/deallocation */
- int (*hbs_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 (*hbs_free)(void *, bus_space_handle_t,
- bus_size_t);
-
- /* get kernel virtual address */
- void * (*hbs_vaddr)(void *, bus_space_handle_t);
-
- /* read (single) */
- uint8_t (*hbs_r_1)(void *, bus_space_handle_t,
- bus_size_t);
- uint16_t (*hbs_r_2)(void *, bus_space_handle_t,
- bus_size_t);
- uint32_t (*hbs_r_4)(void *, bus_space_handle_t,
- bus_size_t);
- uint64_t (*hbs_r_8)(void *, bus_space_handle_t,
- bus_size_t);
-
- /* read multiple */
- void (*hbs_rm_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*hbs_rm_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*hbs_rm_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*hbs_rm_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* read region */
- void (*hbs_rr_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t *, bus_size_t);
- void (*hbs_rr_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t *, bus_size_t);
- void (*hbs_rr_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t *, bus_size_t);
- void (*hbs_rr_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t *, bus_size_t);
-
- /* write (single) */
- void (*hbs_w_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t);
- void (*hbs_w_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t);
- void (*hbs_w_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t);
- void (*hbs_w_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t);
-
- /* write multiple */
- void (*hbs_wm_1)(void *, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*hbs_wm_2)(void *, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*hbs_wm_4)(void *, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*hbs_wm_8)(void *, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* write region */
- void (*hbs_wr_1)(void *, bus_space_handle_t,
- bus_size_t, const uint8_t *, bus_size_t);
- void (*hbs_wr_2)(void *, bus_space_handle_t,
- bus_size_t, const uint16_t *, bus_size_t);
- void (*hbs_wr_4)(void *, bus_space_handle_t,
- bus_size_t, const uint32_t *, bus_size_t);
- void (*hbs_wr_8)(void *, bus_space_handle_t,
- bus_size_t, const uint64_t *, bus_size_t);
-
- /* set multiple */
- void (*hbs_sm_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t, bus_size_t);
- void (*hbs_sm_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t, bus_size_t);
- void (*hbs_sm_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t, bus_size_t);
- void (*hbs_sm_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t, bus_size_t);
-
- /* set region */
- void (*hbs_sr_1)(void *, bus_space_handle_t,
- bus_size_t, uint8_t, bus_size_t);
- void (*hbs_sr_2)(void *, bus_space_handle_t,
- bus_size_t, uint16_t, bus_size_t);
- void (*hbs_sr_4)(void *, bus_space_handle_t,
- bus_size_t, uint32_t, bus_size_t);
- void (*hbs_sr_8)(void *, bus_space_handle_t,
- bus_size_t, uint64_t, bus_size_t);
-
- /* copy */
- void (*hbs_c_1)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
- void (*hbs_c_2)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
- void (*hbs_c_4)(void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t);
- void (*hbs_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 __TYPENAME(BITS) u_int##BITS##_t
-
-#define _BUS_SPACE_READ(PREFIX, BYTES, BITS) \
-static __TYPENAME(BITS) \
-PREFIX##_read_##BYTES(void *, bus_space_handle_t, bus_size_t); \
-static __TYPENAME(BITS) \
-PREFIX##_read_##BYTES(void *tag, bus_space_handle_t bsh, \
- bus_size_t offset) \
-{ \
- _BUS_SPACE_ACCESS_HOOK(); \
- return *(volatile __TYPENAME(BITS) *)(bsh + offset); \
-}
-
-#define _BUS_SPACE_READ_MULTI(PREFIX, BYTES, BITS) \
-static void \
-PREFIX##_read_multi_##BYTES(void *, bus_space_handle_t, bus_size_t, \
- __TYPENAME(BITS) *, bus_size_t); \
-static void \
-PREFIX##_read_multi_##BYTES(void *tag, bus_space_handle_t bsh, \
- bus_size_t offset, __TYPENAME(BITS) *addr, \
- bus_size_t count) \
-{ \
- volatile __TYPENAME(BITS) *p = (void *)(bsh + offset); \
- _BUS_SPACE_ACCESS_HOOK(); \
- while (count--) \
- *addr++ = *p; \
-}
-
-#define _BUS_SPACE_READ_REGION(PREFIX, BYTES, BITS) \
-static void \
-PREFIX##_read_region_##BYTES(void *, bus_space_handle_t, bus_size_t, \
- __TYPENAME(BITS) *, bus_size_t); \
-static void \
-PREFIX##_read_region_##BYTES(void *tag, bus_space_handle_t bsh, \
- bus_size_t offset, __TYPENAME(BITS) *addr, \
- bus_size_t count) \
-{ \
- volatile __TYPENAME(BITS) *p = (void *)(bsh + offset); \
- _BUS_SPACE_ACCESS_HOOK(); \
- while (count--) \
- *addr++ = *p++; \
-}
-
-#define _BUS_SPACE_WRITE(PREFIX, BYTES, BITS) \
-static void \
-PREFIX##_write_##BYTES(void *, bus_space_handle_t, bus_size_t, \
- __TYPENAME(BITS)); \
-static void \
-PREFIX##_write_##BYTES(void *tag, bus_space_handle_t bsh, \
- bus_size_t offset, __TYPENAME(BITS) value) \
-{ \
- _BUS_SPACE_ACCESS_HOOK(); \
- *(volatile __TYPENAME(BITS) *)(bsh + offset) = value; \
-}
-
-#define _BUS_SPACE_WRITE_MULTI(PREFIX, BYTES, BITS) \
-static void \
-PREFIX##_write_multi_##BYTES(void *, bus_space_handle_t, bus_size_t, \
Home |
Main Index |
Thread Index |
Old Index