Do the bus.h -> bus_{defs,funcs}.h split and change all occurrences of
<machine/bus.h> to <sys/bus.h>.
This commit is contained in:
dyoung
parent
37e7f7ec40
commit
f7f7c8b5b4
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpu.c,v 1.2 2011/06/05 17:03:16 matt Exp $ */
|
||||
/* $NetBSD: cpu.c,v 1.3 2011/07/18 17:51:17 dyoung Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008,2009 Frank Wille.
|
||||
@ -29,14 +29,14 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2011/06/05 17:03:16 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.3 2011/07/18 17:51:17 dyoung Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/bus.h>
|
||||
|
||||
#include <machine/autoconf.h>
|
||||
#include <machine/bus.h>
|
||||
#include <machine/cpu.h>
|
||||
|
||||
#include <amiga/amiga/device.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: mainbus.c,v 1.3 2011/06/05 17:03:16 matt Exp $ */
|
||||
/* $NetBSD: mainbus.c,v 1.4 2011/07/18 17:51:17 dyoung Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008,2009 Frank Wille.
|
||||
@ -58,15 +58,15 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2011/06/05 17:03:16 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2011/07/18 17:51:17 dyoung Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/bus.h>
|
||||
|
||||
#include <machine/autoconf.h>
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <amiga/amiga/cfdev.h>
|
||||
#include <amiga/amiga/device.h>
|
||||
|
||||
144
sys/arch/amigappc/include/bus_defs.h
Normal file
144
sys/arch/amigappc/include/bus_defs.h
Normal file
@ -0,0 +1,144 @@
|
||||
/* $NetBSD: bus_defs.h,v 1.1 2011/07/18 17:51:17 dyoung Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Leo Weppelman. 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.
|
||||
*
|
||||
* 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 _AMIGAPPC_BUS_DEFS_H_
|
||||
#define _AMIGAPPC_BUS_DEFS_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* for public use: */
|
||||
|
||||
/*
|
||||
* Memory addresses (in bus space)
|
||||
*/
|
||||
|
||||
typedef u_int32_t bus_addr_t;
|
||||
typedef u_int32_t bus_size_t;
|
||||
|
||||
/*
|
||||
* Access methods for bus resources and address space.
|
||||
*/
|
||||
typedef struct bus_space_tag *bus_space_tag_t;
|
||||
typedef u_long bus_space_handle_t;
|
||||
|
||||
/* unpublic, but needed by method implementors */
|
||||
|
||||
/*
|
||||
* Lazyness macros for function declarations.
|
||||
*/
|
||||
|
||||
#define bsr(what, typ) \
|
||||
typ (what)(bus_space_handle_t, bus_addr_t)
|
||||
|
||||
#define bsw(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_addr_t, unsigned)
|
||||
|
||||
#define bsrm(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, typ *, bus_size_t)
|
||||
|
||||
#define bswm(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, const typ *, bus_size_t)
|
||||
|
||||
#define bssr(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, unsigned, bus_size_t)
|
||||
|
||||
#define bscr(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, \
|
||||
bus_space_handle_t, bus_size_t, bus_size_t)
|
||||
|
||||
/*
|
||||
* Implementation specific structures.
|
||||
* XXX Don't use outside of bus_space definitions!
|
||||
* XXX maybe this should be encapsuled in a non-global .h file?
|
||||
*/
|
||||
|
||||
struct bus_space_tag {
|
||||
bus_addr_t base;
|
||||
const struct amiga_bus_space_methods *absm;
|
||||
};
|
||||
|
||||
struct amiga_bus_space_methods {
|
||||
|
||||
/* map, unmap, etc */
|
||||
|
||||
int (*bsm)(bus_space_tag_t,
|
||||
bus_addr_t, bus_size_t, int, bus_space_handle_t *);
|
||||
|
||||
int (*bsms)(bus_space_handle_t,
|
||||
bus_size_t, bus_size_t, bus_space_handle_t *);
|
||||
|
||||
void (*bsu)(bus_space_handle_t, bus_size_t);
|
||||
|
||||
/* placeholders for currently not implemented alloc and free */
|
||||
|
||||
void *bsa;
|
||||
void *bsf;
|
||||
|
||||
/* 8 bit methods */
|
||||
|
||||
bsr(*bsr1, u_int8_t);
|
||||
bsw(*bsw1, u_int8_t);
|
||||
bsrm(*bsrm1, u_int8_t);
|
||||
bswm(*bswm1, u_int8_t);
|
||||
bsrm(*bsrr1, u_int8_t);
|
||||
bswm(*bswr1, u_int8_t);
|
||||
bssr(*bssr1, u_int8_t);
|
||||
bscr(*bscr1, u_int8_t);
|
||||
|
||||
/* 16bit methods */
|
||||
|
||||
bsr(*bsr2, u_int16_t);
|
||||
bsw(*bsw2, u_int16_t);
|
||||
bsr(*bsrs2, u_int16_t);
|
||||
bsw(*bsws2, u_int16_t);
|
||||
bsrm(*bsrm2, u_int16_t);
|
||||
bswm(*bswm2, u_int16_t);
|
||||
bsrm(*bsrms2, u_int16_t);
|
||||
bswm(*bswms2, u_int16_t);
|
||||
bsrm(*bsrr2, u_int16_t);
|
||||
bswm(*bswr2, u_int16_t);
|
||||
bsrm(*bsrrs2, u_int16_t);
|
||||
bswm(*bswrs2, u_int16_t);
|
||||
bssr(*bssr2, u_int16_t);
|
||||
bscr(*bscr2, u_int16_t);
|
||||
|
||||
/* add 32bit methods here */
|
||||
};
|
||||
|
||||
#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */
|
||||
#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */
|
||||
|
||||
#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
|
||||
|
||||
#define __BUS_SPACE_HAS_STREAM_METHODS
|
||||
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_1;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_2;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_4;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_4swap;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_16;
|
||||
|
||||
#endif /* _AMIGAPPC_BUS_DEFS_H_ */
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bus.h,v 1.7 2010/02/03 13:56:53 phx Exp $ */
|
||||
/* $NetBSD: bus_funcs.h,v 1.1 2011/07/18 17:51:17 dyoung Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
|
||||
@ -24,109 +24,8 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _AMIGA_BUS_H_
|
||||
#define _AMIGA_BUS_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/* for public use: */
|
||||
|
||||
/*
|
||||
* Memory addresses (in bus space)
|
||||
*/
|
||||
|
||||
typedef u_int32_t bus_addr_t;
|
||||
typedef u_int32_t bus_size_t;
|
||||
|
||||
/*
|
||||
* Access methods for bus resources and address space.
|
||||
*/
|
||||
typedef struct bus_space_tag *bus_space_tag_t;
|
||||
typedef u_long bus_space_handle_t;
|
||||
|
||||
/* unpublic, but needed by method implementors */
|
||||
|
||||
/*
|
||||
* Lazyness macros for function declarations.
|
||||
*/
|
||||
|
||||
#define bsr(what, typ) \
|
||||
typ (what)(bus_space_handle_t, bus_addr_t)
|
||||
|
||||
#define bsw(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_addr_t, unsigned)
|
||||
|
||||
#define bsrm(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, typ *, bus_size_t)
|
||||
|
||||
#define bswm(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, const typ *, bus_size_t)
|
||||
|
||||
#define bssr(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, unsigned, bus_size_t)
|
||||
|
||||
#define bscr(what, typ) \
|
||||
void (what)(bus_space_handle_t, bus_size_t, \
|
||||
bus_space_handle_t, bus_size_t, bus_size_t)
|
||||
|
||||
/*
|
||||
* Implementation specific structures.
|
||||
* XXX Don't use outside of bus_space definitions!
|
||||
* XXX maybe this should be encapsuled in a non-global .h file?
|
||||
*/
|
||||
|
||||
struct bus_space_tag {
|
||||
bus_addr_t base;
|
||||
const struct amiga_bus_space_methods *absm;
|
||||
};
|
||||
|
||||
struct amiga_bus_space_methods {
|
||||
|
||||
/* map, unmap, etc */
|
||||
|
||||
int (*bsm)(bus_space_tag_t,
|
||||
bus_addr_t, bus_size_t, int, bus_space_handle_t *);
|
||||
|
||||
int (*bsms)(bus_space_handle_t,
|
||||
bus_size_t, bus_size_t, bus_space_handle_t *);
|
||||
|
||||
void (*bsu)(bus_space_handle_t, bus_size_t);
|
||||
|
||||
/* placeholders for currently not implemented alloc and free */
|
||||
|
||||
void *bsa;
|
||||
void *bsf;
|
||||
|
||||
/* 8 bit methods */
|
||||
|
||||
bsr(*bsr1, u_int8_t);
|
||||
bsw(*bsw1, u_int8_t);
|
||||
bsrm(*bsrm1, u_int8_t);
|
||||
bswm(*bswm1, u_int8_t);
|
||||
bsrm(*bsrr1, u_int8_t);
|
||||
bswm(*bswr1, u_int8_t);
|
||||
bssr(*bssr1, u_int8_t);
|
||||
bscr(*bscr1, u_int8_t);
|
||||
|
||||
/* 16bit methods */
|
||||
|
||||
bsr(*bsr2, u_int16_t);
|
||||
bsw(*bsw2, u_int16_t);
|
||||
bsr(*bsrs2, u_int16_t);
|
||||
bsw(*bsws2, u_int16_t);
|
||||
bsrm(*bsrm2, u_int16_t);
|
||||
bswm(*bswm2, u_int16_t);
|
||||
bsrm(*bsrms2, u_int16_t);
|
||||
bswm(*bswms2, u_int16_t);
|
||||
bsrm(*bsrr2, u_int16_t);
|
||||
bswm(*bswr2, u_int16_t);
|
||||
bsrm(*bsrrs2, u_int16_t);
|
||||
bswm(*bswrs2, u_int16_t);
|
||||
bssr(*bssr2, u_int16_t);
|
||||
bscr(*bscr2, u_int16_t);
|
||||
|
||||
/* add 32bit methods here */
|
||||
};
|
||||
#ifndef _AMIGAPPC_BUS_FUNCS_H_
|
||||
#define _AMIGAPPC_BUS_FUNCS_H_
|
||||
|
||||
/*
|
||||
* Macro definition of map, unmap, etc.
|
||||
@ -240,20 +139,8 @@ struct amiga_bus_space_methods {
|
||||
*/
|
||||
#define bus_space_barrier(t, h, o, l, f) \
|
||||
((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))
|
||||
#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */
|
||||
#define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */
|
||||
|
||||
#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
|
||||
|
||||
#define __BUS_SPACE_HAS_STREAM_METHODS
|
||||
|
||||
/* Instruction for enforcing reorder protection. */
|
||||
#define amiga_bus_reorder_protect() __asm volatile ("eieio")
|
||||
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_1;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_2;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_4;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_4swap;
|
||||
extern const struct amiga_bus_space_methods amiga_bus_stride_16;
|
||||
|
||||
#endif /* _AMIGA_BUS_H_ */
|
||||
#endif /* _AMIGAPPC_BUS_FUNCS_H_ */
|
||||
Loading…
Reference in New Issue
Block a user