Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge arm32/dev/bus_space_notimpl.S and hpcarm/hpcarm/bus_space_notimpl.S

Browse Source 
into arm/arm/bus_space_notimpl.S.  They were identical anyway.

This file has no excuse for being in assembler, but I'll leave that for another
day.
This commit is contained in:
bjh21 2001-06-18 22:26:15 +00:00
parent dbfbb9d8c6
commit cb36bacea5
8 changed files with 8 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arch/hpcarm/hpcarm/bus_space_notimpl.S → sys/arch/arm/arm/bus_space_notimpl.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_space_notimpl.S,v 1.1 2001/02/23 03:48:09 ichiro Exp $ */
/* $NetBSD: bus_space_notimpl.S,v 1.1 2001/06/18 22:26:15 bjh21 Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.

3
sys/arch/arm/conf/files.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm,v 1.31 2001/06/05 09:25:06 bjh21 Exp $
# $NetBSD: files.arm,v 1.32 2001/06/18 22:26:15 bjh21 Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defopt ARM32
@ -47,6 +47,7 @@ file arch/arm/arm/disassem.c
file arch/arm/arm/arm_machdep.c
file arch/arm/arm/blockio.S
file arch/arm/arm/bootconfig.c
file arch/arm/arm/bus_space_notimpl.S arm32
file arch/arm/arm/compat_13_machdep.c compat_13
file arch/arm/arm/cpufunc.c
file arch/arm/arm/cpufunc_asm.S

3
sys/arch/arm32/conf/files.arm32
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm32,v 1.116 2001/06/18 20:49:14 bjh21 Exp $
# $NetBSD: files.arm32,v 1.117 2001/06/18 22:26:15 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@ -359,7 +359,6 @@ file arch/arm32/arm32/setcpsr.S
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/intr.c
file arch/arm32/dev/bus_space_notimpl.S
file arch/arm/arm/disksubr.c disk
file arch/arm/arm/disksubr_acorn.c disk

152
sys/arch/arm32/dev/bus_space_notimpl.S
View File

@ -1,152 +0,0 @@
/* $NetBSD: bus_space_notimpl.S,v 1.6 1999/11/03 22:13:20 mycroft Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
* 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 Mark Brinicombe.
* 4. The name of the company nor the name of the author may 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 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.
*/
#include <machine/asm.h>
/*
* BUS_SPACE - name of this bus space
*/
#define BUS_SPACE bs_notimpl
#define __C(x,y) __CONCAT(x,y)
#define __S(s) __STRING(s)
#define NAME(func) __C(BUS_SPACE,__C(_bs_,func))
#define LNAME(func) __C(L,NAME(func))
#define __L(x) _C_LABEL(x)
#define GLOBAL(func) .global __L(NAME(func))
#define LABEL(func) __L(NAME(func)):
#define LLABEL(func) LNAME(func):
#define FTEXT(func,text) __S(__C(NAME(func),text))
#define NOT_IMPL(func) \
GLOBAL(func) ; \
LABEL(func) ; \
stmfd sp!, {r0-r3} ; \
adr r0, LNAME(__C(func,_text)) ; \
mov r1, sp ; \
b _C_LABEL(panic) ; \
; \
LLABEL(__C(func,_text)) ; \
.asciz FTEXT(func,: args at 0x%08x\n) ; \
.align 0 ;
/*
* Generic bus_space I/O functions
*/
/*
* read single
*/
NOT_IMPL(r_1)
NOT_IMPL(r_2)
NOT_IMPL(r_4)
NOT_IMPL(r_8)
/*
* write single
*/
NOT_IMPL(w_1)
NOT_IMPL(w_2)
NOT_IMPL(w_4)
NOT_IMPL(w_8)
/*
* read multiple
*/
NOT_IMPL(rm_1)
NOT_IMPL(rm_2)
NOT_IMPL(rm_4)
NOT_IMPL(rm_8)
/*
* write multiple
*/
NOT_IMPL(wm_1)
NOT_IMPL(wm_2)
NOT_IMPL(wm_4)
NOT_IMPL(wm_8)
/*
* read region
*/
NOT_IMPL(rr_1)
NOT_IMPL(rr_2)
NOT_IMPL(rr_4)
NOT_IMPL(rr_8)
/*
* write region
*/
NOT_IMPL(wr_1)
NOT_IMPL(wr_2)
NOT_IMPL(wr_4)
NOT_IMPL(wr_8)
/*
* set multiple
*/
NOT_IMPL(sm_1)
NOT_IMPL(sm_2)
NOT_IMPL(sm_4)
NOT_IMPL(sm_8)
/*
* set region
*/
NOT_IMPL(sr_1)
NOT_IMPL(sr_2)
NOT_IMPL(sr_4)
NOT_IMPL(sr_8)
/*
* copy
*/
NOT_IMPL(c_1)
NOT_IMPL(c_2)
NOT_IMPL(c_4)
NOT_IMPL(c_8)

4
sys/arch/cats/conf/files.cats
View File

@ -1,4 +1,4 @@
# $NetBSD: files.cats,v 1.5 2001/06/12 08:30:47 chris Exp $
# $NetBSD: files.cats,v 1.6 2001/06/18 22:26:17 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@ -89,8 +89,6 @@ file arch/arm32/arm32/spl.S
file arch/arm32/arm32/stubs.c
file arch/arm32/arm32/vm_machdep.c
file arch/arm32/dev/bus_space_notimpl.S
# library functions
file arch/arm/arm/disksubr.c disk

4
sys/arch/dnard/conf/files.dnard
View File

@ -1,4 +1,4 @@
# $NetBSD: files.dnard,v 1.10 2001/05/29 23:03:21 bjh21 Exp $
# $NetBSD: files.dnard,v 1.11 2001/06/18 22:26:17 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@ -101,8 +101,6 @@ file arch/arm32/arm32/spl.S
file arch/arm32/arm32/stubs.c
file arch/arm32/arm32/vm_machdep.c
file arch/arm32/dev/bus_space_notimpl.S
# library functions
file arch/arm/arm/disksubr.c disk

3
sys/arch/hpcarm/conf/files.hpcarm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.hpcarm,v 1.18 2001/06/01 02:51:03 toshii Exp $
# $NetBSD: files.hpcarm,v 1.19 2001/06/18 22:26:17 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@ -24,7 +24,6 @@ major {md = 18}
# Generic MD files
file arch/hpcarm/hpcarm/autoconf.c
file arch/hpcarm/hpcarm/bus_space_notimpl.S
file arch/hpcarm/hpcarm/conf.c
file arch/hpcarm/hpcarm/cpuswitch.S
file arch/hpcarm/hpcarm/exception.S

3
sys/arch/netwinder/conf/files.netwinder
View File

@ -1,4 +1,4 @@
# $NetBSD: files.netwinder,v 1.11 2001/06/12 17:10:25 matt Exp $
# $NetBSD: files.netwinder,v 1.12 2001/06/18 22:26:18 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@ -93,7 +93,6 @@ file arch/arm32/arm32/setcpsr.S
file arch/arm32/arm32/setstack.S
file arch/arm32/arm32/spl.S
file arch/arm32/arm32/intr.c
file arch/arm32/dev/bus_space_notimpl.S
file arch/arm/arm/disksubr.c disk
file arch/arm/arm/disksubr_acorn.c disk