Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use the bus_space_generic bus space ops.
details: https://anonhg.NetBSD.org/src/rev/3eb8176605d7
branches: trunk
changeset: 525535:3eb8176605d7
user: thorpej <thorpej%NetBSD.org@localhost>
date: Fri Apr 12 19:02:30 2002 +0000
description:
Use the bus_space_generic bus space ops.
diffstat:
sys/arch/arm/conf/files.footbridge | 8 +-
sys/arch/arm/xscale/files.i80312 | 5 +-
sys/arch/arm/xscale/files.i80321 | 5 +-
sys/arch/arm/xscale/i80312_space.c | 40 ++-
sys/arch/arm/xscale/i80312_space_asm.S | 299 -------------------------------
sys/arch/arm/xscale/i80321_space.c | 40 ++-
sys/arch/arm/xscale/i80321_space_asm.S | 299 -------------------------------
sys/arch/evbarm/conf/files.iq80310 | 5 +-
sys/arch/evbarm/conf/files.iq80321 | 5 +-
sys/arch/evbarm/iq80310/obio_space.c | 17 +-
sys/arch/evbarm/iq80310/obio_space_asm.S | 131 -------------
sys/arch/evbarm/iq80321/obio_space.c | 17 +-
sys/arch/evbarm/iq80321/obio_space_asm.S | 131 -------------
13 files changed, 71 insertions(+), 931 deletions(-)
diffs (truncated from 1283 to 300 lines):
diff -r 7a57c2f54afc -r 3eb8176605d7 sys/arch/arm/conf/files.footbridge
--- a/sys/arch/arm/conf/files.footbridge Fri Apr 12 18:56:57 2002 +0000
+++ b/sys/arch/arm/conf/files.footbridge Fri Apr 12 19:02:30 2002 +0000
@@ -1,23 +1,21 @@
-# $NetBSD: files.footbridge,v 1.7 2002/04/10 20:12:08 thorpej Exp $
+# $NetBSD: files.footbridge,v 1.8 2002/04/12 19:12:30 thorpej Exp $
#
# Shared footbridge files information
# DC21285 "Footbridge" specific files
define footbridge {}
-device footbridge: pcibus, todservice
+device footbridge: pcibus, bus_space_generic, todservice
attach footbridge at mainbus
file arch/arm/footbridge/footbridge.c footbridge
file arch/arm/footbridge/footbridge_machdep.c footbridge
file arch/arm/footbridge/footbridge_io.c footbridge
-file arch/arm/footbridge/footbridge_io_asm.S footbridge
file arch/arm/footbridge/footbridge_pci.c footbridge
file arch/arm/footbridge/footbridge_irq.S footbridge
file arch/arm/footbridge/footbridge_irqhandler.c footbridge
file arch/arm/footbridge/footbridge_clock.c footbridge
# DC21285 "Footbridge" serial port
-device fcom: tty
+device fcom: tty, bus_space_generic
attach fcom at footbridge
file arch/arm/footbridge/footbridge_com.c fcom needs-flag
file arch/arm/footbridge/footbridge_com_io.c fcom
-file arch/arm/footbridge/footbridge_com_io_asm.S fcom
diff -r 7a57c2f54afc -r 3eb8176605d7 sys/arch/arm/xscale/files.i80312
--- a/sys/arch/arm/xscale/files.i80312 Fri Apr 12 18:56:57 2002 +0000
+++ b/sys/arch/arm/xscale/files.i80312 Fri Apr 12 19:02:30 2002 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: files.i80312,v 1.4 2001/11/29 08:27:11 thorpej Exp $
+# $NetBSD: files.i80312,v 1.5 2002/04/12 19:02:30 thorpej Exp $
#
# Configuration info for Intel i80312 Companion I/O support
#
file arch/arm/xscale/i80312_mem.c
-device iopxs: pcibus
+device iopxs: pcibus, bus_space_generic
# Board-specific front-end provides attachment.
file arch/arm/xscale/i80312.c iopxs
file arch/arm/xscale/i80312_gpio.c iopxs
file arch/arm/xscale/i80312_pci.c iopxs
file arch/arm/xscale/i80312_pci_dma.c iopxs
file arch/arm/xscale/i80312_space.c iopxs
-file arch/arm/xscale/i80312_space_asm.S iopxs
diff -r 7a57c2f54afc -r 3eb8176605d7 sys/arch/arm/xscale/files.i80321
--- a/sys/arch/arm/xscale/files.i80321 Fri Apr 12 18:56:57 2002 +0000
+++ b/sys/arch/arm/xscale/files.i80321 Fri Apr 12 19:02:30 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i80321,v 1.1 2002/03/27 21:45:47 thorpej Exp $
+# $NetBSD: files.i80321,v 1.2 2002/04/12 19:02:30 thorpej Exp $
#
# Configuration info for Intel i80321 XScale I/O Processor support
#
@@ -8,10 +8,9 @@
file arch/arm/xscale/i80321_mcu.c
file arch/arm/xscale/i80321_timer.c
-device iopxs: pcibus
+device iopxs: pcibus, bus_space_generic
# Board-specific front-end provides attachment.
file arch/arm/xscale/i80321.c iopxs
file arch/arm/xscale/i80321_pci.c iopxs
file arch/arm/xscale/i80321_pci_dma.c iopxs
file arch/arm/xscale/i80321_space.c iopxs
-file arch/arm/xscale/i80321_space_asm.S iopxs
diff -r 7a57c2f54afc -r 3eb8176605d7 sys/arch/arm/xscale/i80312_space.c
--- a/sys/arch/arm/xscale/i80312_space.c Fri Apr 12 18:56:57 2002 +0000
+++ b/sys/arch/arm/xscale/i80312_space.c Fri Apr 12 19:02:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80312_space.c,v 1.2 2001/11/28 21:08:47 thorpej Exp $ */
+/* $NetBSD: i80312_space.c,v 1.3 2002/04/12 19:02:30 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -53,6 +53,8 @@
bs_protos(i80312);
bs_protos(i80312_io);
bs_protos(i80312_mem);
+bs_protos(generic);
+bs_protos(generic_armv4);
bs_protos(bs_notimpl);
/*
@@ -82,39 +84,39 @@
i80312_bs_barrier,
/* read (single) */
- i80312_bs_r_1,
- i80312_bs_r_2,
- i80312_bs_r_4,
+ generic_bs_r_1,
+ generic_armv4_bs_r_2,
+ generic_bs_r_4,
bs_notimpl_bs_r_8,
/* read multiple */
- i80312_bs_rm_1,
- i80312_bs_rm_2,
- i80312_bs_rm_4,
+ generic_bs_rm_1,
+ generic_armv4_bs_rm_2,
+ generic_bs_rm_4,
bs_notimpl_bs_rm_8,
/* read region */
bs_notimpl_bs_rr_1,
- i80312_bs_rr_2,
- i80312_bs_rr_4,
+ generic_armv4_bs_rr_2,
+ generic_bs_rr_4,
bs_notimpl_bs_rr_8,
/* write (single) */
- i80312_bs_w_1,
- i80312_bs_w_2,
- i80312_bs_w_4,
+ generic_bs_w_1,
+ generic_armv4_bs_w_2,
+ generic_bs_w_4,
bs_notimpl_bs_w_8,
/* write multiple */
- i80312_bs_wm_1,
- i80312_bs_wm_2,
- i80312_bs_wm_4,
+ generic_bs_wm_1,
+ generic_armv4_bs_wm_2,
+ generic_bs_wm_4,
bs_notimpl_bs_wm_8,
/* write region */
bs_notimpl_bs_wr_1,
- i80312_bs_wr_2,
- i80312_bs_wr_4,
+ generic_armv4_bs_wr_2,
+ generic_bs_wr_4,
bs_notimpl_bs_wr_8,
/* set multiple */
@@ -125,13 +127,13 @@
/* set region */
bs_notimpl_bs_sr_1,
- i80312_bs_sr_2,
+ generic_armv4_bs_sr_2,
bs_notimpl_bs_sr_4,
bs_notimpl_bs_sr_8,
/* copy */
bs_notimpl_bs_c_1,
- i80312_bs_c_2,
+ generic_armv4_bs_c_2,
bs_notimpl_bs_c_4,
bs_notimpl_bs_c_8,
};
diff -r 7a57c2f54afc -r 3eb8176605d7 sys/arch/arm/xscale/i80312_space_asm.S
--- a/sys/arch/arm/xscale/i80312_space_asm.S Fri Apr 12 18:56:57 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-/* $NetBSD: i80312_space_asm.S,v 1.1 2001/11/09 03:27:51 thorpej Exp $ */
-
-/*
- * Copyright (c) 1997 Causality Limited.
- * 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
- * for the NetBSD Project.
- * 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 functions for the i80312
- */
-
-/*
- * Note these functions use ARM Architecture V4 instructions as
- * all i80312 based systems have Intel XScale processors on them.
- */
-
-/*
- * read single
- */
-
-ENTRY(i80312_bs_r_1)
- ldrb r0, [r1, r2]
- mov pc, lr
-
-ENTRY(i80312_bs_r_2)
- ldrh r0, [r1, r2]
- mov pc, lr
-
-ENTRY(i80312_bs_r_4)
- ldr r0, [r1, r2]
- mov pc, lr
-
-/*
- * write single
- */
-
-ENTRY(i80312_bs_w_1)
- strb r3, [r1, r2]
- mov pc, lr
-
-ENTRY(i80312_bs_w_2)
- strh r3, [r1, r2]
- mov pc, lr
-
-ENTRY(i80312_bs_w_4)
- str r3, [r1, r2]
- mov pc, lr
-
-/*
- * read multiple
- */
-
-ENTRY(i80312_bs_rm_1)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-Li80312_bs_rm_1_loop:
- ldrb r3, [r0]
- strb r3, [r1], #1
- subs r2, r2, #1
- bne Li80312_bs_rm_1_loop
-
- mov pc, lr
-
-ENTRY(i80312_bs_rm_2)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-Li80312_bs_rm_2_loop:
- ldrh r3, [r0]
- strh r3, [r1], #2
- subs r2, r2, #1
- bne Li80312_bs_rm_2_loop
-
- mov pc, lr
-
-ENTRY(i80312_bs_rm_4)
- add r0, r1, r2
- mov r1, r3
- ldr r2, [sp, #0]
- teq r2, #0
- moveq pc, lr
-
-Li80312_bs_rm_4_loop:
- ldr r3, [r0]
- str r3, [r1], #4
- subs r2, r2, #1
- bne Li80312_bs_rm_4_loop
-
- mov pc, lr
-
-/*
- * write multiple
- */
-
-ENTRY(i80312_bs_wm_1)
- add r0, r1, r2
Home |
Main Index |
Thread Index |
Old Index